diff --git a/common/content/configbase.js b/common/content/configbase.js
index 07473baa..7a1e2ab3 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -127,6 +127,9 @@ const ConfigBase = Class(ModuleBase, {
      */
     scripts: [],
 
+    get tabStrip()
+        Class.replaceProperty(this, "tabStrip", document.getElementById("TabsToolbar") || this.tabbrowser.mTabContainer),
+
     /**
      * @property {string} The leaf name of any temp files created by
      *     {@link io.createTempFile}.
diff --git a/common/content/tabs.js b/common/content/tabs.js
index ac0465e0..f0a2a82a 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -31,7 +31,8 @@ const Tabs = Module("tabs", {
         // hide tabs initially to prevent flickering when 'stal' would hide them
         // on startup
         if (config.hasTabbrowser)
-            config.tabbrowser.mTabContainer.collapsed = true; // FIXME: see 'stal' comment
+            config.tabStrip.collapsed = true; // FIXME: see 'stal' comment
+
     },
 
     _updateTabCount: function () {
@@ -987,7 +988,7 @@ const Tabs = Module("tabs", {
                     // don't have to fight against the host app's attempts to keep
                     // it open - hack! Adding a filter watch to mStrip is probably
                     // the cleanest solution.
-                    let tabStrip = config.tabbrowser.mTabContainer;
+                    let tabStrip = config.tabStrip;
 
                     if (value == 0)
                         tabStrip.collapsed = true;