diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji-autocomplete.js b/app/assets/javascripts/discourse/lib/emoji/emoji-autocomplete.js
deleted file mode 100644
index 48abf219f..000000000
--- a/app/assets/javascripts/discourse/lib/emoji/emoji-autocomplete.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// TODO: Make this a proper ES6 import
-var ComposerView = require('discourse/views/composer').default;
-
-ComposerView.on("initWmdEditor", function(){
-  if (!Discourse.SiteSettings.enable_emoji) { return; }
-
-  var template = Handlebars.compile(
-    "<div class='autocomplete'>" +
-      "<ul>" +
-        "{{#each options}}" +
-            "<li>" +
-              "<a href='#'><img src='{{src}}' class='emoji'> {{code}}</a>" +
-            "</li>" +
-        "{{/each}}" +
-      "</ul>" +
-    "</div>"
-  );
-
-  $('#wmd-input').autocomplete({
-    template: template,
-    key: ":",
-    transformComplete: function(v){ return v.code + ":"; },
-    dataSource: function(term){
-      return new Ember.RSVP.Promise(function(resolve) {
-        var full = ":" + term;
-        term = term.toLowerCase();
-
-        if (term === "") {
-          return resolve(["smile", "smiley", "wink", "sunny", "blush"]);
-        }
-
-        if (Discourse.Emoji.translations[full]) {
-          return resolve([Discourse.Emoji.translations[full]]);
-        }
-
-        var options = Discourse.Emoji.search(term, {maxResults: 5});
-
-        return resolve(options);
-      }).then(function(list) {
-        return list.map(function(i) {
-          return {code: i, src: Discourse.Emoji.urlFor(i)};
-        });
-      });
-    }
-  });
-});
diff --git a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
new file mode 100644
index 000000000..ed2e39c7a
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
@@ -0,0 +1,9 @@
+<div class='autocomplete'>
+  <ul>
+    {{#each options}}
+      <li>
+        <a href><img src='{{src}}' class='emoji'> {{code}}</a>
+      </li>
+    {{/each}}
+  </ul>
+</div>
diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6
index f69462c71..325e23f13 100644
--- a/app/assets/javascripts/discourse/views/composer.js.es6
+++ b/app/assets/javascripts/discourse/views/composer.js.es6
@@ -163,6 +163,39 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
     this.trigger('previewRefreshed', $wmdPreview);
   },
 
+  _applyEmojiAutocomplete: function() {
+    if (!this.siteSettings.enable_emoji) { return; }
+
+    var template = this.container.lookup('template:emoji-selector-autocomplete.raw');
+    $('#wmd-input').autocomplete({
+      template: template,
+      key: ":",
+      transformComplete: function(v){ return v.code + ":"; },
+      dataSource: function(term){
+        return new Ember.RSVP.Promise(function(resolve) {
+          var full = ":" + term;
+          term = term.toLowerCase();
+
+          if (term === "") {
+            return resolve(["smile", "smiley", "wink", "sunny", "blush"]);
+          }
+
+          if (Discourse.Emoji.translations[full]) {
+            return resolve([Discourse.Emoji.translations[full]]);
+          }
+
+          var options = Discourse.Emoji.search(term, {maxResults: 5});
+
+          return resolve(options);
+        }).then(function(list) {
+          return list.map(function(i) {
+            return {code: i, src: Discourse.Emoji.urlFor(i)};
+          });
+        });
+      }
+    });
+  },
+
   initEditor: function() {
     // not quite right, need a callback to pass in, meaning this gets called once,
     // but if you start replying to another topic it will get the avatars wrong
@@ -172,6 +205,7 @@ var ComposerView = Discourse.View.extend(Ember.Evented, {
 
     $LAB.script(assetPath('defer/html-sanitizer-bundle'));
     ComposerView.trigger("initWmdEditor");
+    this._applyEmojiAutocomplete();
 
     var template = this.container.lookup('template:user-selector-autocomplete.raw');
     $wmdInput.data('init', true);