diff --git a/common/content/tabs.js b/common/content/tabs.js
index f213b289..f868ed9a 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -113,7 +113,7 @@ function Tabs() //{{{
     // hide tabs initially to prevent flickering when 'stal' would hide them
     // on startup
     if (config.hasTabbrowser)
-        getBrowser().mStrip.collapsed = true;
+        getBrowser().mTabContainer.collapsed = true; // FIXME: see 'stal' comment
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// OPTIONS /////////////////////////////////////////////////
@@ -125,15 +125,18 @@ function Tabs() //{{{
         {
             setter: function (value)
             {
-                let tabStrip = tabs.tabStrip;
-
-                if (!tabStrip)
-                    return options["showtabline"]; // XXX
+                // FIXME: we manipulate mTabContainer underneath mStrip so we
+                // 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 = getBrowser().mTabContainer;
 
                 if (value == 0)
                     tabStrip.collapsed = true;
                 else
                 {
+                    // FIXME: Why are we preferring our own created preference
+                    // here? --djk
                     let pref = "browser.tabStrip.autoHide";
                     if (options.getPref(pref) == null) // Try for FF 3.0 & 3.1
                         pref = "browser.tabs.autoHide";
@@ -739,11 +742,6 @@ function Tabs() //{{{
          */
         get localStore() this.getLocalStore(),
 
-        /**
-         * @property {Object} The tab browser strip.
-         */
-        get tabStrip() getBrowser().mStrip,
-
         /**
          * @property {Object[]} The array of closed tabs for the current
          *     session.
diff --git a/vimperator/TODO b/vimperator/TODO
index d9b693f8..1fd7fe89 100644
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -16,6 +16,7 @@ BUGS:
 - :sidebar improvements (:sidebar! Downloads while downloads is open should refocus the sidebar)
 - ;s saves the page rather than the image
 - RC file is sourced once per window
+- :undo seems to be effected by whether the tabstrip state
 
 (recent CVS regressions):
 - visual caret mode is broken, requires a manual page focus first anyway or