diff --git a/content/treestyletab/treestyletab.css b/content/treestyletab/treestyletab.css
index 5b96e4ba..b95560a3 100644
--- a/content/treestyletab/treestyletab.css
+++ b/content/treestyletab/treestyletab.css
@@ -23,7 +23,9 @@
 .tabbrowser-strip[treestyletab-tabbar-autohide="hidden"],
 .tabbrowser-tabs[treestyletab-tabbar-autohide="hidden"],
 .tabbrowser-strip[treestyletab-tabbar-autohide="hidden"]+splitter,
-tabbrowser:not([treestyletab-tabbar-autohide="hidden"]) .treestyletab-tabbar-toggler,
+tabbrowser[treestyletab-tabbar-autohide-mode="1"][tabcontainer] .tabbrowser-strip[treestyletab-tabbar-placeholder="true"],
+tabbrowser[treestyletab-tabbar-autohide-mode="1"][tabcontainer] .tabbrowser-strip[treestyletab-tabbar-placeholder="true"]+splitter,
+.treestyletab-tabbar-toggler,
 #TabsToolbar[treestyletab-tabbar-autohide="hidden"] > *,
 #TabsToolbar #treestyletab-tabbar-resizer-box,
 #appcontent[ahFull="true"] .tabbrowser-strip[ahHIDE="true"]+splitter /* AutoHide */,
@@ -36,6 +38,11 @@ window[chromehidden~="toolbar"] .tabbrowser-strip[treestyletab-tabbar-placeholde
 window[chromehidden~="toolbar"] .tabbrowser-strip[treestyletab-tabbar-placeholder="true"]+splitter {
 	visibility: collapse;
 }
+
+tabbrowser[treestyletab-tabbar-autohide-mode="1"][tabcontainer] .treestyletab-tabbar-toggler,
+tabbrowser[treestyletab-tabbar-autohide-mode="1"][treestyletab-tabbar-autohide="hidden"] .treestyletab-tabbar-toggler {
+	visibility: visible;
+}
 
 
 .tabbrowser-tabs[treestyletab-mode="vertical"] .tabbrowser-arrowscrollbox > .scrollbutton-up,
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index cf9e788c..03dae9ec 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -1370,9 +1370,9 @@ TreeStyleTabBrowser.prototype = {
 	updateFloatingTabbarResizer : function TSTBrowser_updateFloatingTabbarResizer(aSize)
 	{
 		var width      = aSize.width;
-		var realWidth  = aSize.realWidth;
+		var realWidth  = this.autoHide.mode == this.autoHide.kMODE_HIDE ? 0 : aSize.realWidth ;
 		var height     = aSize.height;
-		var realHeight = aSize.realHeight;
+		var realHeight = this.autoHide.mode == this.autoHide.kMODE_HIDE ? 0 : aSize.realHeight ;
 		var pos        = this.currentTabbarPosition;
 		var vertical = this.isVertical;