diff --git a/app/assets/javascripts/discourse/views/composer/composer_view.js b/app/assets/javascripts/discourse/views/composer/composer_view.js
index 1305bc2baf1..ad3080ff633 100644
--- a/app/assets/javascripts/discourse/views/composer/composer_view.js
+++ b/app/assets/javascripts/discourse/views/composer/composer_view.js
@@ -75,7 +75,7 @@ Discourse.ComposerView = Discourse.View.extend(Ember.Evented, {
       var replyControl = $('#reply-control');
       var h = replyControl.height() || 0;
       var sizePx = "" + h + "px";
-      $('.topic-area').css('padding-bottom', sizePx);
+      $('#main-outlet').css('padding-bottom', sizePx);
       $('.composer-popup').css('bottom', sizePx);
     });
   }.observes('model.composeState'),
@@ -438,6 +438,7 @@ Discourse.ComposerView = Discourse.View.extend(Ember.Evented, {
   },
 
   childWillDestroyElement: function() {
+    $('#main-outlet').css('padding-bottom', 0);
     this._unbindUploadTarget();
   },