diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 44b50541..17c8ca93 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -1703,7 +1703,8 @@ TreeStyleTabBrowser.prototype = {
 				break;
 
 			case 'extensions.treestyletab.tabbar.style':
-				this.setTabbarStyle(value);
+			case 'extensions.treestyletab.tabbar.style.aero':
+				this.setTabbarStyle(this.getTreePref('tabbar.style'));
 				value = this.getTreePref('twisty.style');
 				if (value != 'auto')
 					break;
@@ -1792,10 +1793,6 @@ TreeStyleTabBrowser.prototype = {
 
 		if (aStyle) {
 			let additionalValues = [];
-			if (/-aero$/.test(aStyle)) {
-				additionalValues.push('aero');
-				aStyle = aStyle.replace('-aero', '')
-			}
 			if (/^(plain|flat|mixed|vertigo)$/.test(aStyle))
 				additionalValues.push('square');
 			if (/^(plain|flat|mixed)$/.test(aStyle))
@@ -1804,6 +1801,8 @@ TreeStyleTabBrowser.prototype = {
 				additionalValues.push('color');
 			if (/^(plain|mixed)$/.test(aStyle))
 				additionalValues.push('shadow');
+			if (this.getTreePref('tabbar.style.aero'))
+				additionalValues.push('aero');
 			if (additionalValues.length)
 				aStyle = additionalValues.join(' ')+' '+aStyle;
 
diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js
index 61ba7795..3059a755 100644
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@@ -18,7 +18,8 @@ pref("extensions.treestyletab.tabbar.scroll.duration", 250);
 // 0 = no scroll, 1 = scroll to new tab only when the current tab will not scrolled out, 2 = scroll to new tab always
 pref("extensions.treestyletab.tabbar.scrollToNewTab.mode", 1);
 // flat, mixed, vertigo
-pref("extensions.treestyletab.tabbar.style",           "mixed");
+pref("extensions.treestyletab.tabbar.style",      "mixed");
+pref("extensions.treestyletab.tabbar.style.aero", false);
 // 0 = disabled, 1 = hide, 2 = shrink
 pref("extensions.treestyletab.tabbar.autoHide.mode",                   0);
 pref("extensions.treestyletab.tabbar.autoHide.mode.fullscreen",        1);