diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 046e92fc11c..3c827e7791b 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -89,7 +89,6 @@ export default Ember.Component.extend({
   _renderUnseen: function($preview, unseen) {
     fetchUnseenMentions($preview, unseen, this.siteSettings).then(() => {
       linkSeenMentions($preview, this.siteSettings);
-      this.trigger('previewRefreshed', $preview);
     });
   },
 
@@ -349,6 +348,7 @@ export default Ember.Component.extend({
 
       // Paint oneboxes
       $('a.onebox', $preview).each((i, e) => Discourse.Onebox.load(e, refresh));
+      this.trigger('previewRefreshed', $preview);
     },
   }
 });
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 5008c963e2d..b7a7ece9129 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -1,5 +1,6 @@
-let _decorateId = 0;
+import ComposerEditor from 'discourse/components/composer-editor';
 
+let _decorateId = 0;
 function decorate(klass, evt, cb) {
   const mixin = {};
   mixin["_decorate_" + (_decorateId++)] = function($elem) { cb($elem); }.on(evt);
@@ -10,7 +11,7 @@ export function decorateCooked(container, cb) {
   const postView = container.lookupFactory('view:post');
   decorate(postView, 'postViewInserted', cb);
   decorate(postView, 'postViewUpdated', cb);
-  decorate(container.lookupFactory('view:composer'), 'previewRefreshed', cb);
+  decorate(ComposerEditor, 'previewRefreshed', cb);
   decorate(container.lookupFactory('view:embedded-post'), 'didInsertElement', cb);
   decorate(container.lookupFactory('view:user-stream'), 'didInsertElement', cb);
 }
diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6
index d811c6fdf89..c9abb4c23d0 100644
--- a/app/assets/javascripts/discourse/views/composer.js.es6
+++ b/app/assets/javascripts/discourse/views/composer.js.es6
@@ -4,7 +4,7 @@ import { headerHeight } from 'discourse/views/header';
 import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators';
 import Composer from 'discourse/models/composer';
 
-const ComposerView = Ember.View.extend(Ember.Evented, {
+const ComposerView = Ember.View.extend({
   _lastKeyTimeout: null,
   elementId: 'reply-control',
   classNameBindings: ['composer.creatingPrivateMessage:private-message',