diff --git a/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js b/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js
index 394138c5c..c2a2cfac7 100644
--- a/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js
+++ b/vendor/gems/discourse_emoji/vendor/assets/javascripts/discourse_emoji.js
@@ -37,20 +37,19 @@
     ":-$"   : 'blush'
   };
 
-  Object.keys(translations).forEach(function (code) {
+  emoji.forEach(function (e) {
+    Discourse.Dialect.inlineReplace(":" + e + ":", function(code) {
+      return imageFor(e);
+    });
+  });
 
+  Object.keys(translations).forEach(function (code) {
     var replacement = translations[code];
     Discourse.Dialect.inlineReplace(code, function (code) {
       return imageFor(replacement);
     });
   });
 
-  Discourse.Dialect.inlineBetween({
-    between: ':',
-    rawContents: true,
-    emitter: imageFor
-  });
-
   if (Discourse && Discourse.ComposerView) {
     Discourse.ComposerView.on("initWmdEditor", function(event){