diff --git a/content/treestyletab/treestyletab.css b/content/treestyletab/treestyletab.css
index c070b1de..24544e94 100644
--- a/content/treestyletab/treestyletab.css
+++ b/content/treestyletab/treestyletab.css
@@ -217,32 +217,34 @@ toolbar.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
 }
 
 @media all and (-moz-windows-compositor) {
-	#navigator-toolbox[tabsontop="true"] > .treestyletab-tabbar-toolbar,
-	#navigator-toolbox[tabsontop="true"] > .treestyletab-tabbar-toolbar:-moz-lwtheme,
+	#navigator-toolbox[tabsontop="true"]
+	  > :-moz-any(.treestyletab-tabbar-toolbar,
+	              .treestyletab-tabbar-toolbar:-moz-lwtheme,
+	              .treestyletab-tabbar-toolbar-ready,
+	              .treestyletab-tabbar-toolbar-ready:-moz-lwtheme),
 	#navigator-toolbox
 	  > #nav-bar + #customToolbars
 	  + #PersonalToolbar[collapsed="true"]
-	  + .treestyletab-tabbar-toolbar[tabsontop="true"]:last-child,
-	#navigator-toolbox
-	  > #nav-bar + #customToolbars
-	  + #PersonalToolbar[collapsed="true"]
-	  + .treestyletab-tabbar-toolbar[tabsontop="true"]:not(:last-child),
-	#navigator-toolbox
-	  > #nav-bar + #customToolbars
-	  + #PersonalToolbar[collapsed="true"]
-	  + .treestyletab-tabbar-toolbar[tabsontop="false"]:last-child,
-	#navigator-toolbox
-	  > #nav-bar + #customToolbars
-	  + #PersonalToolbar[collapsed="true"]
-	  + .treestyletab-tabbar-toolbar[tabsontop="false"]:not(:last-child) {
+	  + :-moz-any(.treestyletab-tabbar-toolbar[tabsontop="true"]:last-child,
+	              .treestyletab-tabbar-toolbar[tabsontop="true"]:not(:last-child),
+	              .treestyletab-tabbar-toolbar[tabsontop="false"]:last-child,
+	              .treestyletab-tabbar-toolbar[tabsontop="false"]:not(:last-child),
+	              .treestyletab-tabbar-toolbar-ready[tabsontop="true"]:last-child,
+	              .treestyletab-tabbar-toolbar-ready[tabsontop="true"]:not(:last-child),
+	              .treestyletab-tabbar-toolbar-ready[tabsontop="false"]:last-child,
+	              .treestyletab-tabbar-toolbar-ready[tabsontop="false"]:not(:last-child)) {
 		-moz-binding: url(treestyletab.xml#toolbar-drag);
 	}
 }
-.treestyletab-tabbar-toolbar {
+.treestyletab-tabbar-toolbar,
+.treestyletab-tabbar-toolbar-ready {
 	-moz-binding: url(treestyletab.xml#toolbar-drag);
 }
-#navigator-toolbox[tabsontop="false"] > .treestyletab-tabbar-toolbar,
-#navigator-toolbox[tabsontop="false"] > .treestyletab-tabbar-toolbar:-moz-lwtheme {
+#navigator-toolbox[tabsontop="false"]
+  > :-moz-any(.treestyletab-tabbar-toolbar,
+              .treestyletab-tabbar-toolbar-ready,
+              .treestyletab-tabbar-toolbar:-moz-lwtheme,
+              .treestyletab-tabbar-toolbar-ready:-moz-lwtheme) {
 	-moz-binding: url(treestyletab.xml#toolbar);
 }
 .treestyletab-tabbar-toolbar:not([treestyletab-tabbar-position="top"]),
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 0ffa914a..11063751 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -1769,7 +1769,9 @@ TreeStyleTabBrowser.prototype = {
 		this.removeTabStripAttribute('ordinal');
 		this.removeTabStripAttribute('orient');
 
-		this.destroyTabStrip(this.ownerToolbar);
+		var toolbar = this.ownerToolbar;
+		this.destroyTabStrip(toolbar);
+		toolbar.classList.add(this.kTABBAR_TOOLBAR_READY);
 
 		this._endListenTabbarEvents();
 
@@ -1795,8 +1797,8 @@ TreeStyleTabBrowser.prototype = {
 	{
 		this.stopRendering();
 
-		this.ownerToolbar.classList.remove(this.kTABBAR_TOOLBAR_READY);
 		this.ownerToolbar.classList.add(this.kTABBAR_TOOLBAR);
+		this.ownerToolbar.classList.remove(this.kTABBAR_TOOLBAR_READY);
 		Array.slice(document.querySelectorAll('.'+this.kTABBAR_TOOLBAR_READY_POPUP))
 			.forEach(function(aPanel) {
 				this.safeRemovePopup(aPanel);
@@ -1827,6 +1829,8 @@ TreeStyleTabBrowser.prototype = {
 	updateCustomizedTabsToolbar : function TSTBrowser_updateCustomizedTabsToolbar() 
 	{
 		var newToolbar = this.ownerToolbar;
+		newToolbar.classList.add(this.kTABBAR_TOOLBAR_READY);
+
 		var oldToolbar = document.querySelector('.'+this.kTABBAR_TOOLBAR_READY);
 		if (oldToolbar == newToolbar)
 			return;
@@ -1836,8 +1840,6 @@ TreeStyleTabBrowser.prototype = {
 			oldToolbar.classList.remove(this.kTABBAR_TOOLBAR_READY);
 		}
 
-		newToolbar.classList.add(this.kTABBAR_TOOLBAR_READY);
-
 		var id = newToolbar.id+'-'+this.kTABBAR_TOOLBAR_READY_POPUP;
 		var panel = document.getElementById(id);
 		if (!panel) {