diff --git a/content/treestyletab/treestyletab.css b/content/treestyletab/treestyletab.css
index 2846f3d5..c070b1de 100644
--- a/content/treestyletab/treestyletab.css
+++ b/content/treestyletab/treestyletab.css
@@ -153,7 +153,15 @@ tabbrowser[treestyletab-tabbar-autohide-mode="1"][treestyletab-tabbar-autohide="
 }
 
 .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab {
+  .tabbrowser-tab,
+toolbar.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
+  > toolbarbutton,
+toolbar.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
+  > .treestyletab-toolbar-inner-box > toolbarbutton,
+toolbar.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
+  > toolbaritem,
+toolbar.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
+  > .treestyletab-toolbar-inner-box > toolbaritem {
 	-moz-box-flex: 0 !important;
 }
 
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 7bd37a1b..38939ff9 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -950,6 +950,15 @@ TreeStyleTabBrowser.prototype = {
 			this.removeTabStripAttribute('height');
 			b.mPanelContainer.removeAttribute('height');
 
+			if (strip.localName == 'toolbar') {
+				Array.forEach(strip.childNodes, function(aNode) {
+					if (aNode.localName == 'tabs')
+						return;
+					aNode.setAttribute('treestyletab-backup-flex', aNode.getAttribute('flex'));
+					aNode.removeAttribute('flex');
+				}, this);
+			}
+
 			if (pos == this.kTABBAR_RIGHT) {
 				this.setTabbrowserAttribute(this.kTABBAR_POSITION, 'right');
 				if (this.getTreePref('tabbar.invertTab')) {
@@ -1020,6 +1029,18 @@ TreeStyleTabBrowser.prototype = {
 			this.setTabbrowserAttribute(this.kMODE, this.getTreePref('tabbar.multirow') ? 'multirow' : 'horizontal');
 			this.removeTabbrowserAttribute(this.kTAB_INVERTED);
 
+			if (strip.localName == 'toolbar') {
+				Array.forEach(strip.childNodes, function(aNode) {
+					if (aNode.localName == 'tabs')
+						return;
+					var flex = aNode.hasAttribute('treestyletab-backup-flex');
+					if (!flex)
+						return;
+					aNode.setAttribute('flex', flex);
+					aNode.removeAttribute('treestyletab-backup-flex');
+				}, this);
+			}
+
 			if (pos == this.kTABBAR_BOTTOM) {
 				this.setTabbrowserAttribute(this.kTABBAR_POSITION, 'bottom');
 				this.indentTarget = 'bottom';