diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 2b35079e..dc8c7e23 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -1051,7 +1051,10 @@ TreeStyleTabBrowser.prototype = {
    
 /* nsIObserver */ 
 	
-	domain : 'extensions.treestyletab', 
+	domains : [ 
+		'extensions.treestyletab',
+		'browser.fullscreen.autohide'
+	],
  
 	observe : function(aSubject, aTopic, aData) 
 	{
@@ -1239,6 +1242,14 @@ TreeStyleTabBrowser.prototype = {
 					toggler.removeAttribute('collapsed');
 				break;
 
+			case 'browser.fullscreen.autohide':
+				if (!window.fullScreen) return;
+				this.endAutoHide();
+				this.autoHideMode = value ? this.getTreePref('tabbar.autoHide.mode.fullscreen') : this.kAUTOHIDE_MODE_DISABLED ;
+				if (this.autoHideMode != this.kAUTOHIDE_MODE_DISABLED)
+					this.startAutoHide();
+				break;
+
 			default:
 				break;
 		}
@@ -4096,7 +4107,9 @@ TreeStyleTabBrowser.prototype = {
 	{
 		this.autoHideMode = this.getTreePref('tabbar.autoHide.mode');
 		this.endAutoHide();
-		this.autoHideMode = this.getTreePref('tabbar.autoHide.mode.fullscreen');
+		this.autoHideMode = this.getPref('browser.fullscreen.autohide') ?
+				this.getTreePref('tabbar.autoHide.mode.fullscreen') :
+				this.kAUTOHIDE_MODE_DISABLED ;
 		if (this.autoHideMode != this.kAUTOHIDE_MODE_DISABLED) {
 			this.startAutoHide();
 			this.mTabBrowser.mStrip.removeAttribute('moz-collapsed');