diff --git a/framework/core/ember/app/components/discussion/stream-scrubber.js b/framework/core/ember/app/components/discussion/stream-scrubber.js
index f58286088..e9dd1b2a7 100644
--- a/framework/core/ember/app/components/discussion/stream-scrubber.js
+++ b/framework/core/ember/app/components/discussion/stream-scrubber.js
@@ -167,7 +167,7 @@ export default Ember.Component.extend({
     // Adjust the height of the scrollbar so that it fills the height of
     // the sidebar and doesn't overlap the footer.
     var scrollbar = view.$('.scrubber-scrollbar');
-    scrollbar.css('max-height', $(window).height() - scrollbar.offset().top + $(window).scrollTop() - $('#footer').outerHeight(true));
+    scrollbar.css('max-height', $(window).height() - scrollbar.offset().top + $(window).scrollTop() - parseInt($('#page').css('padding-bottom')));
   },
 
   windowWasScrolled: function(event) {
diff --git a/framework/core/ember/app/styles/flarum/layout.less b/framework/core/ember/app/styles/flarum/layout.less
index 2e79d771f..d1b71acd8 100644
--- a/framework/core/ember/app/styles/flarum/layout.less
+++ b/framework/core/ember/app/styles/flarum/layout.less
@@ -384,7 +384,7 @@ body {
 // right.
 @media @tablet, @desktop, @desktop-hd {
   .global-page {
-    padding-bottom: 150px;
+    padding-bottom: 100px;
     position: relative;
   }
   .global-footer {