diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6
index 9e8b538490f..8a4050bc033 100644
--- a/app/assets/javascripts/discourse/views/composer.js.es6
+++ b/app/assets/javascripts/discourse/views/composer.js.es6
@@ -545,8 +545,11 @@ const ComposerView = Discourse.View.extend(Ember.Evented, {
 
     this.$('.wmd-preview').off('click.preview');
 
+    const self = this;
+
     Em.run.next(() => {
-      $('#main-outlet').css('padding-bottom', 0);
+      const sizePx = self.get('composeState') === Discourse.Composer.CLOSED ? 0 : $('#reply-control').height();
+      $('#main-outlet').css('padding-bottom', sizePx);
       // need to wait a bit for the "slide down" transition of the composer
       Em.run.later(() => {
         this.appEvents.trigger("composer:closed");