diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index 0729b60652a..fa69ae2132a 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -115,8 +115,8 @@ const gTabStripPrefListener =
     if (topic != "nsPref:changed")
       return;
 
-    var stripVisibility = !pref.getBoolPref(prefName);
-    if (gBrowser.tabContainer.childNodes.length == 1) {
+    if (gBrowser.tabContainer.childNodes.length == 1 && window.toolbar.visible) {
+      var stripVisibility = !pref.getBoolPref(prefName);
       gBrowser.setStripVisibilityTo(stripVisibility);
       pref.setBoolPref("browser.tabs.forceHide", false);
     }
diff --git a/xpfe/global/resources/content/bindings/tabbrowser.xml b/xpfe/global/resources/content/bindings/tabbrowser.xml
index 69d94fee779..29874ca36ea 100644
--- a/xpfe/global/resources/content/bindings/tabbrowser.xml
+++ b/xpfe/global/resources/content/bindings/tabbrowser.xml
@@ -55,7 +55,7 @@
     <content>
       <xul:stringbundle src="chrome://global/locale/tabbrowser.properties"/>
       <xul:tabbox flex="1" eventnode="document" xbl:inherits="handleCtrlPageUpDown">
-        <xul:hbox class="tabbrowser-strip chromeclass-toolbar" collapsed="true" tooltip="_child" context="_child">
+        <xul:hbox class="tabbrowser-strip" collapsed="true" tooltip="_child" context="_child">
           <xul:tooltip onpopupshowing="event.preventBubble(); if (document.tooltipNode.hasAttribute('label')) { this.setAttribute('label', document.tooltipNode.getAttribute('label')); return true; } return false;"/>
           <xul:menupopup onpopupshowing="this.parentNode.parentNode.parentNode.updatePopupMenu(this);">
             <xul:menuitem label="&closeTab.label;" accesskey="&closeTab.accesskey;"
@@ -967,8 +967,7 @@
               return;
 
             if (l == 2) {
-              var autohide = this.mPrefs.getBoolPref("browser.tabs.autoHide");
-              if (autohide)
+              if (this.mPrefs.getBoolPref("browser.tabs.autoHide"))
                 this.mStrip.collapsed = true;
             }
 
@@ -1498,7 +1497,8 @@
           this.mTabFilters[0] = filter;
 
           if (!this.mPrefs.getBoolPref("browser.tabs.autoHide") &&
-              !this.mPrefs.getBoolPref("browser.tabs.forceHide"))
+              !this.mPrefs.getBoolPref("browser.tabs.forceHide") &&
+              window.toolbar.visible)
             this.mStrip.collapsed = false;
         ]]>
       </constructor>