diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 42d53fdd64b4da878926f38f6a69916768e39601..73db5262db7410e308dfca129c3932e99e583249 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3116,21 +3116,9 @@ button.close {
 
 .navbar-fixed-top,
 .navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: 1030;
   border-radius: 0;
 }
 
-.navbar-fixed-top {
-  top: 0;
-}
-
-.navbar-fixed-bottom {
-  bottom: 0;
-}
-
 .navbar .brand {
   display: inline-block;
   padding: 7px 15px;
@@ -3329,6 +3317,19 @@ button.close {
   .navbar-inverse .nav > .divider {
     border-right-color: #2f2f2f;
   }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: fixed;
+    right: 0;
+    left: 0;
+    z-index: 1030;
+  }
+  .navbar-fixed-top {
+    top: 0;
+  }
+  .navbar-fixed-bottom {
+    bottom: 0;
+  }
   .navbar .btn-navbar {
     display: none;
   }
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index e42e5e86904a412bdce55a3232b58fb526ad4bdd..5f19d11b6c3225a03fe5e7ba2314467ca4654de7 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -10,7 +10,7 @@
 
 body {
   position: relative; /* For scrollyspy */
-  padding-top: 62px; /* Default height of navbar */
+  /* We add the padding to the body for >768px only */
 }
 
 /*  */
@@ -534,9 +534,9 @@ input.focused {
 /* Tablets and up */
 @media screen and (min-width: 768px) {
 
-  /* Account for fixed navbar */
+  /* Account for fixed navbar (which is static to start) */
   body {
-    padding-top: 50px;
+    padding-top: 62px; /* Default height of navbar */
   }
 
   /* Tweak display of docs jumbotrons */
diff --git a/less/navbar.less b/less/navbar.less
index c043d8462a1d736474e509b5e6550734c36e3245..b82534e4304fe109e1e93adbf3f2f61e76ab007a 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -49,17 +49,11 @@
   border-radius: 0;
 }
 
-// Fixed navbar
+// Fixed navbars aren't fixed to start; that comes at >768px
 .navbar-fixed-top,
 .navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: @zindex-navbar-fixed;
   border-radius: 0;
 }
-.navbar-fixed-top    { top: 0; }
-.navbar-fixed-bottom { bottom: 0; }
 
 
 
@@ -276,6 +270,17 @@
     border-right-color: lighten(@navbar-inverse-bg, 5%);
   }
 
+  // Fix the top/bottom navbars when screen real estate supports it
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: fixed;
+    right: 0;
+    left: 0;
+    z-index: @zindex-navbar-fixed;
+  }
+  .navbar-fixed-top    { top: 0; }
+  .navbar-fixed-bottom { bottom: 0; }
+
   // Required to make the collapsing navbar work on regular desktops
   .navbar .btn-navbar {
     display: none;