diff --git a/static/css/custom.css b/static/css/custom.css
index 64e95e1a0..470b3001e 100644
--- a/static/css/custom.css
+++ b/static/css/custom.css
@@ -1,5 +1,6 @@
 body {
     padding-top: 60px;
+    padding-bottom: 60px;
 }
 
 #fixed_content { 
@@ -10,14 +11,6 @@ body {
     overflow: hidden;
 }
 
-#bottom-bar {
-    position: fixed;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin-bottom: 0;
-}
-
 .navbar-text { 
     color: #999999 !important;
 }
diff --git a/templates/nlayout.html b/templates/nlayout.html
index 6173e9403..bc4cb7ad9 100644
--- a/templates/nlayout.html
+++ b/templates/nlayout.html
@@ -44,7 +44,7 @@
       </div>
     </div>    
     {% block content %}{% endblock %}
-    <div id="bottom-bar" class="navbar">
+    <div id="bottom-bar" class="navbar navbar-fixed-bottom">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="row">