diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index f2a6ae3bc84..a08e03914e4 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -70,7 +70,7 @@ export default Component.extend(KeyEnterEscape, {
         return;
       }
 
-      const h = $("#reply-control").height() || 0;
+      const h = $("#reply-control:not(.saving)").height() || 0;
       this.movePanels(h);
     });
   },