diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6
index 2f816491f..aa6650571 100644
--- a/app/assets/javascripts/discourse/views/composer.js.es6
+++ b/app/assets/javascripts/discourse/views/composer.js.es6
@@ -90,11 +90,16 @@ const ComposerView = Ember.View.extend({
       onDrag: sizePx => this.movePanels(sizePx)
     });
 
-    afterTransition($replyControl, () => {
-      resize();
+    const triggerOpen = () => {
       if (this.get('composer.composeState') === Composer.OPEN) {
         this.appEvents.trigger('composer:opened');
       }
+    };
+    triggerOpen();
+
+    afterTransition($replyControl, () => {
+      resize();
+      triggerOpen();
     });
     positioningWorkaround(this.$());
   },