diff --git a/content/treestyletab/treestyletabbrowser_autoHide.js b/content/treestyletab/treestyletabbrowser_autoHide.js
index 43c87303..1dc1f18e 100644
--- a/content/treestyletab/treestyletabbrowser_autoHide.js
+++ b/content/treestyletab/treestyletabbrowser_autoHide.js
@@ -1241,9 +1241,15 @@ TreeStyleTabBrowserAutoHide.__defineSetter__('mode', function(aValue) {
 TreeStyleTabBrowserAutoHide.mMode = TreeStyleTabBrowserAutoHide.prototype.kMODE_HIDE; 
   
 TreeStyleTabBrowserAutoHide.toggleMode = function TSTAutoHide_toggleMode() { /* PUBLIC API */ 
-	TreeStyleTabService.setTreePref('tabbar.autoHide.mode',
-		TreeStyleTabService.getTreePref('tabbar.autoHide.mode') == this.prototype.kMODE_DISABLED ?
-			TreeStyleTabService.getTreePref('tabbar.autoHide.mode.toggle') :
+	var key       = 'tabbar.autoHide.mode';
+	var toggleKey = 'tabbar.autoHide.mode.toggle';
+	if (window.fullScreen) {
+		key       += '.fullscreen';
+		toggleKey += '.fullscreen';
+	}
+	TreeStyleTabService.setTreePref(key,
+		TreeStyleTabService.getTreePref(key) == this.prototype.kMODE_DISABLED ?
+			TreeStyleTabService.getTreePref(toggleKey) :
 			this.prototype.kMODE_DISABLED
 	);
 };
diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js
index adb92dc8..20cd84ef 100644
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@@ -18,9 +18,10 @@ pref("extensions.treestyletab.tabbar.scroll.duration", 250);
 // flat, mixed, vertigo
 pref("extensions.treestyletab.tabbar.style",           "mixed");
 // 0 = disabled, 1 = hide, 2 = shrink
-pref("extensions.treestyletab.tabbar.autoHide.mode",       0);
-pref("extensions.treestyletab.tabbar.autoHide.mode.toggle", 2);
-pref("extensions.treestyletab.tabbar.autoHide.mode.fullscreen", 1);
+pref("extensions.treestyletab.tabbar.autoHide.mode",                   0);
+pref("extensions.treestyletab.tabbar.autoHide.mode.fullscreen",        1);
+pref("extensions.treestyletab.tabbar.autoHide.mode.toggle",            2);
+pref("extensions.treestyletab.tabbar.autoHide.mode.toggle.fullscreen", 1);
 pref("extensions.treestyletab.tabbar.autoHide.delay",      50);
 pref("extensions.treestyletab.tabbar.autoHide.area",       7);
 pref("extensions.treestyletab.tabbar.autoHide.expandArea", false);