diff --git a/app/assets/javascripts/discourse/app/components/composer-body.js b/app/assets/javascripts/discourse/app/components/composer-body.js
index 7891a218f53..a8a2a76f679 100644
--- a/app/assets/javascripts/discourse/app/components/composer-body.js
+++ b/app/assets/javascripts/discourse/app/components/composer-body.js
@@ -1,4 +1,4 @@
-import { cancel, later, run, schedule, throttle } from "@ember/runloop";
+import { cancel, later, schedule, throttle } from "@ember/runloop";
 import discourseComputed, {
   bind,
   observes,
@@ -53,34 +53,6 @@ export default Component.extend(KeyEnterEscape, {
     return composeState || Composer.CLOSED;
   },
 
-  movePanels(size) {
-    document.querySelector("#main-outlet").style.paddingBottom = size
-      ? `${size}px`
-      : "";
-
-    // signal the progress bar it should move!
-    this.appEvents.trigger("composer:resized");
-  },
-
-  @observes("composeState", "composer.{action,canEditTopicFeaturedLink}")
-  resize() {
-    schedule("afterRender", () => {
-      if (!this.element || this.isDestroying || this.isDestroyed) {
-        return;
-      }
-
-      discourseDebounce(this, this.debounceMove, 300);
-    });
-  },
-
-  debounceMove() {
-    let height = 0;
-    if (!this.element.classList.contains("saving")) {
-      height = this.element.offsetHeight;
-    }
-    this.movePanels(height);
-  },
-
   keyUp() {
     this.typed();
 
@@ -128,11 +100,31 @@ export default Component.extend(KeyEnterEscape, {
     this.appEvents.trigger("composer:div-resizing");
     this.element.classList.add("clear-transitions");
     const currentMousePos = mouseYPos(event);
-    let size = this.origComposerSize + (this.lastMousePos - currentMousePos);
 
+    let size = this.origComposerSize + (this.lastMousePos - currentMousePos);
     size = Math.min(size, window.innerHeight - headerOffset());
-    this.movePanels(size);
-    this.element.style.height = size ? `${size}px` : "";
+    const minHeight = parseInt(getComputedStyle(this.element).minHeight, 10);
+    size = Math.max(minHeight, size);
+
+    ["--reply-composer-height", "--new-topic-composer-height"].forEach((prop) =>
+      document.documentElement.style.setProperty(prop, size ? `${size}px` : "")
+    );
+
+    this._triggerComposerResized();
+  },
+
+  @observes("composeState", "composer.{action,canEditTopicFeaturedLink}")
+  _triggerComposerResized() {
+    schedule("afterRender", () => {
+      if (!this.element || this.isDestroying || this.isDestroyed) {
+        return;
+      }
+      discourseDebounce(this, this.composerResized, 300);
+    });
+  },
+
+  composerResized() {
+    this.appEvents.trigger("composer:resized");
   },
 
   @bind
@@ -213,7 +205,6 @@ export default Component.extend(KeyEnterEscape, {
 
     this.setupComposerResizeEvents();
 
-    const resize = () => run(() => this.resize());
     const triggerOpen = () => {
       if (this.get("composer.composeState") === Composer.OPEN) {
         this.appEvents.trigger("composer:opened");
@@ -222,7 +213,6 @@ export default Component.extend(KeyEnterEscape, {
     triggerOpen();
 
     afterTransition($(this.element), () => {
-      resize();
       triggerOpen();
     });
     positioningWorkaround($(this.element));
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 5a8024c7391..e9d1739cedd 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -1,3 +1,13 @@
+:root {
+  --reply-composer-height: 300px;
+  --new-topic-composer-height: 400px;
+}
+html.composer-open {
+  #main-outlet {
+    padding-bottom: var(--reply-composer-height);
+    transition: padding-bottom 250ms ease;
+  }
+}
 #reply-control {
   position: fixed;
   display: flex;
@@ -43,9 +53,10 @@
   }
 
   &.open {
-    height: 300px;
+    height: var(--reply-composer-height);
     &.edit-title {
-      height: 400px; // more room when editing the title
+      // more room when editing the title
+      height: var(--new-topic-composer-height);
     }
   }