diff --git a/gui/default/assets/css/overrides.css b/gui/default/assets/css/overrides.css
index 9d0caadca..897d84652 100644
--- a/gui/default/assets/css/overrides.css
+++ b/gui/default/assets/css/overrides.css
@@ -246,11 +246,32 @@ ul.three-columns li, ul.two-columns li {
 /** Footer nav on small devices **/
 
 @media (max-width: 1199px) {
+    /* Stay at the end of the page, with space reserved for the footer
+    usually taking up two rows. */
+
+    html {
+        position: relative;
+        min-height: 100%;
+    }
+
     body {
-        padding-bottom: 0;
+        padding-bottom: 60px;
     }
 
     .navbar-fixed-bottom {
-        position: static;
+        position: absolute;
     }
 }
+
+@media (max-width: 768px) {
+    /* Layout after the normal contents, as this is when the footer switches
+    to a vertical layout. */
+
+    body {
+        padding-bottom: 0px;
+    }
+
+    .navbar-fixed-bottom {
+        position: relative;
+    }
+}
\ No newline at end of file