diff --git a/services/web/public/stylesheets/core/_common-variables.less b/services/web/public/stylesheets/core/_common-variables.less
index 927663b65d..039c0c890d 100644
--- a/services/web/public/stylesheets/core/_common-variables.less
+++ b/services/web/public/stylesheets/core/_common-variables.less
@@ -794,7 +794,7 @@
 // Custom
 @is-overleaf: false;
 @header-height: 69px;
-@footer-height: 81px;
+@footer-height: 50px;
 
 @content-alt-bg-color: lighten(@gray-lightest, 2.5%);
 
diff --git a/services/web/public/stylesheets/core/ol-variables.less b/services/web/public/stylesheets/core/ol-variables.less
index 9067d2744f..0a884fbc3f 100644
--- a/services/web/public/stylesheets/core/ol-variables.less
+++ b/services/web/public/stylesheets/core/ol-variables.less
@@ -1,8 +1,8 @@
 @import "./_common-variables.less";
 
 @is-overleaf: true;
-@header-height: 69px;
-@footer-height: 81px;
+@header-height: 70px;
+@footer-height: 50px;
 
 // Styleguide colors
 @ol-blue-gray-1 : #E4E8EE;
diff --git a/services/web/public/stylesheets/core/scaffolding.less b/services/web/public/stylesheets/core/scaffolding.less
index 78c919d8bb..3258e36c2c 100755
--- a/services/web/public/stylesheets/core/scaffolding.less
+++ b/services/web/public/stylesheets/core/scaffolding.less
@@ -29,8 +29,10 @@ body {
   line-height: @line-height-base;
   color: @text-color;
   background-color: @body-bg;
-  height: 100vh;
+  min-height: 100vh;
   position: relative;
+  padding-top: @header-height;
+  padding-bottom: @footer-height;
 }
 
 // Reset fonts for relevant elements