diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index dfb81f6da85..4170748632e 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -565,7 +565,7 @@ const Composer = RestModel.extend({
       if (postStream) {
         postStream.undoPost(createdPost);
       }
-      composer.set('composeState', OPEN);
+      Ember.run.next(() => composer.set('composeState', OPEN));
     }));
   },