diff --git a/framework/core/js/forum/src/components/discussion-page.js b/framework/core/js/forum/src/components/discussion-page.js
index 845df884e..2f2ae0b7e 100644
--- a/framework/core/js/forum/src/components/discussion-page.js
+++ b/framework/core/js/forum/src/components/discussion-page.js
@@ -136,8 +136,13 @@ export default class DiscussionPage extends mixin(Component, evented) {
     }
 
     app.pane.disable();
-    app.composer.minimize();
     app.session.off('loggedIn', this.loggedInHandler);
+
+    if (app.composingReplyTo(discussion) && !app.composer.component.content()) {
+      app.composer.hide();
+    } else {
+      app.composer.minimize();
+    }
   }
 
   /**