diff --git a/index.html b/index.html
index 238febe324..d6afce75a2 100644
--- a/index.html
+++ b/index.html
@@ -42,7 +42,7 @@ this repository contains the full copyright notices and license terms. -->
             <div class="container-fluid">
                 <div class="navbar-header">
                     <button type="button" class="navbar-toggle collapsed"
-                        data-toggle="collapse" data-target="#user_menu_collapse">
+                        data-toggle="collapse" data-target="#main_navbar">
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
@@ -55,7 +55,7 @@ this repository contains the full copyright notices and license terms. -->
                         </button>
                     </p>
                 </div>
-                <div class="collapse navbar-collapse" id="user_menu_collapse">
+                <div class="collapse navbar-collapse" id="main_navbar">
                     <ul class="nav navbar-nav">
                         <li id="user-preferences"></li>
                         <li id="user-favorites"></li>
diff --git a/src/tab.js b/src/tab.js
index cd157d3e31..ff4685ed82 100644
--- a/src/tab.js
+++ b/src/tab.js
@@ -128,12 +128,12 @@
                 'target': tabs.parent(),
                 'offset': {
                     'top': function() {
-                        return tabs.find('.nav-tabs').height();
+                        return jQuery('#main_navbar').height();
                     }
                 }
             });
             toolbar.on('affix.bs.affix', function() {
-                wrapper.height(toolbar.height());
+                wrapper.height(jQuery('#main_navbar').height());
             });
             toolbar.on('affix-top.bs.affix affix-bottom.bs.affix',
                     function() {