diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js
index 3265e67f76be..6bd240d66649 100644
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -384,6 +384,8 @@ var BrowserUI = {
     var rect = document.getElementById("browser-container").getBoundingClientRect();
     var containerW = rect.right - rect.left;
     var containerH = rect.bottom - rect.top;
+    var toolbar = document.getElementById("toolbar-main");
+    var toolbarH = toolbar.boxObject.height;
 
     var browser = document.getElementById("browser");
     browser.width = containerW;
@@ -396,14 +398,13 @@ var BrowserUI = {
       tabbar.left = -tabbar.boxObject.width;
       panelUI.left = containerW + sidebar.boxObject.width;
       sidebar.left = containerW;
-      sidebar.height = panelUI.height = tabbar.height = containerH;
+      sidebar.height = tabbar.height = (panelUI.height = containerH) - toolbarH;
     }
     panelUI.width = containerW - sidebar.boxObject.width - tabbar.boxObject.width;
 
-    var toolbar = document.getElementById("toolbar-main");
     var popup = document.getElementById("popup_autocomplete");
     toolbar.width = containerW;
-    popup.height = containerH - toolbar.boxObject.height;
+    popup.height = containerH - toolbarH;
   },
 
   init : function() {
diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index ce3137358dbd..d02e629763c5 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -217,9 +217,10 @@
     </toolbar>
 
     <vbox id="browser-controls" style="-moz-stack-sizing: ignore;" top="60" left="0">
+      <toolbarbutton id="tool-star" class="browser-control-button" command="cmd_star"/>
       <toolbarbutton id="tool-back" class="browser-control-button" command="cmd_back"/>
       <toolbarbutton id="tool-forward" class="browser-control-button" command="cmd_forward"/>
-      <toolbarbutton id="tool-star" class="browser-control-button" command="cmd_star"/>
+      <toolbarspring/>
       <toolbarbutton id="tool-actions" class="browser-control-button" command="cmd_actions"/>
       <toolbarbutton id="tool-prefs" class="browser-control-button" command="cmd_panel"/>
     </vbox>