diff --git a/framework/core/js/forum/dist/app.js b/framework/core/js/forum/dist/app.js
index 60e3bd907..21e7cf8ef 100644
--- a/framework/core/js/forum/dist/app.js
+++ b/framework/core/js/forum/dist/app.js
@@ -19820,6 +19820,10 @@ System.register('flarum/components/Composer', ['flarum/Component', 'flarum/utils
               defaultHeight = this.$().height();
             }
 
+            // Set the height of the Composer element and its contents on each redraw,
+            // so that they do not lose it if their DOM elements are recreated.
+            this.updateHeight();
+
             if (isInitialized) return;
 
             // Since this component is a part of the global UI that persists between
diff --git a/framework/core/js/forum/src/components/Composer.js b/framework/core/js/forum/src/components/Composer.js
index f498333e6..93532d700 100644
--- a/framework/core/js/forum/src/components/Composer.js
+++ b/framework/core/js/forum/src/components/Composer.js
@@ -91,6 +91,10 @@ class Composer extends Component {
       defaultHeight = this.$().height();
     }
 
+    // Set the height of the Composer element and its contents on each redraw,
+    // so that they do not lose it if their DOM elements are recreated.
+    this.updateHeight();
+
     if (isInitialized) return;
 
     // Since this component is a part of the global UI that persists between