diff --git a/app/assets/javascripts/discourse/controllers/composer_controller.js b/app/assets/javascripts/discourse/controllers/composer_controller.js
index 1f32fb28a5b..1e1fa362004 100644
--- a/app/assets/javascripts/discourse/controllers/composer_controller.js
+++ b/app/assets/javascripts/discourse/controllers/composer_controller.js
@@ -306,8 +306,10 @@ Discourse.ComposerController = Discourse.Controller.extend({
       }
     }
 
-    composer = composer || Discourse.Composer.create();
-    composer.open(opts);
+    if ( !composer ) {
+      composer = Discourse.Composer.create();
+      composer.open(opts);
+    }
 
     this.set('model', composer);
     composer.set('composeState', Discourse.Composer.OPEN);