diff --git a/app/assets/javascripts/discourse/views/composer/composer_view.js b/app/assets/javascripts/discourse/views/composer/composer_view.js
index a85934d16..1f36698cb 100644
--- a/app/assets/javascripts/discourse/views/composer/composer_view.js
+++ b/app/assets/javascripts/discourse/views/composer/composer_view.js
@@ -114,8 +114,13 @@ Discourse.ComposerView = Discourse.View.extend(Ember.Evented, {
     });
     Discourse.TransitionHelper.after($replyControl, this.resize);
     this.ensureMaximumDimensionForImagesInPreview();
+    this.set('controller.view', this);
   }.on('didInsertElement'),
 
+  _unlinkView: function() {
+    this.set('controller.view', null);
+  }.on('willDestroyElement'),
+
   ensureMaximumDimensionForImagesInPreview: function() {
     // This enforce maximum dimensions of images in the preview according
     // to the current site settings.