diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index 6c6d7c7b..5b7d51dc 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -126,7 +126,9 @@
 
 		<menuseparator id="context-separator-toggleAutoHide"/>
 		<menuitem id="context-item-toggleAutoHide"
-			label="&context.toggleAutoHide.label;"
+			label="&context.toggleAutoHide.label.hide;"
+			label-hide="&context.toggleAutoHide.label.hide;"
+			label-shrink="&context.toggleAutoHide.label.shrink;"
 			accesskey="&context.toggleAutoHide.accesskey;"
 			type="checkbox"
 			autocheck="false"
diff --git a/locale/cs/treestyletab/treestyletab.dtd b/locale/cs/treestyletab/treestyletab.dtd
index 63ab3723..c57e86df 100644
--- a/locale/cs/treestyletab/treestyletab.dtd
+++ b/locale/cs/treestyletab/treestyletab.dtd
@@ -178,7 +178,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey   "S">
 <!ENTITY context.expandAllSubtree.label         "Rozbalit všechny stromy">
 <!ENTITY context.expandAllSubtree.accesskey     "R">
-<!ENTITY context.toggleAutoHide.label           "Schovávat lištu panelů">
+<!ENTITY context.toggleAutoHide.label.hide      "Schovávat lištu panelů">
+<!ENTITY context.toggleAutoHide.label.shrink    "Zmenšit lištu panelů">
 <!ENTITY context.toggleAutoHide.accesskey       "l">
 <!ENTITY context.toggleFixed.label              "Ustálit umístění a šířku/výšku lišty panelů">
 <!ENTITY context.toggleFixed.label.horizontal   "Ustálit umístění a výšku lišty panelů">
diff --git a/locale/da-DK/treestyletab/treestyletab.dtd b/locale/da-DK/treestyletab/treestyletab.dtd
index 1b9834b8..29da5016 100644
--- a/locale/da-DK/treestyletab/treestyletab.dtd
+++ b/locale/da-DK/treestyletab/treestyletab.dtd
@@ -192,7 +192,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey "o">
 <!ENTITY context.expandAllSubtree.label "Udvid alle">
 <!ENTITY context.expandAllSubtree.accesskey "v">
-<!ENTITY context.toggleAutoHide.label "Autoskjul fanebjælke">
+<!ENTITY context.toggleAutoHide.label.hide "Autoskjul fanebjælke">
+<!ENTITY context.toggleAutoHide.label.shrink "Auto shrink tab bar">
 <!ENTITY context.toggleAutoHide.accesskey "t">
 <!ENTITY context.toggleFixed.label "Lås fanebjælkens placering/højde">
 <!ENTITY context.toggleFixed.label.horizontal "Lås fanebjælkens placering/højde">
diff --git a/locale/de-DE/treestyletab/treestyletab.dtd b/locale/de-DE/treestyletab/treestyletab.dtd
index e93436f9..226d7108 100644
--- a/locale/de-DE/treestyletab/treestyletab.dtd
+++ b/locale/de-DE/treestyletab/treestyletab.dtd
@@ -190,7 +190,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey "c">
 <!ENTITY context.expandAllSubtree.label     "Alle Zweige aufklappen">
 <!ENTITY context.expandAllSubtree.accesskey "e">
-<!ENTITY context.toggleAutoHide.label     "Tableiste verstecken">
+<!ENTITY context.toggleAutoHide.label.hide      "Tableiste verstecken">
+<!ENTITY context.toggleAutoHide.label.shrink    "Tableiste verkleinert anzeigen">
 <!ENTITY context.toggleAutoHide.accesskey "h">
 <!ENTITY context.toggleFixed.label            "Feste Position und Größe der Tableiste">
 <!ENTITY context.toggleFixed.label.horizontal "Feste Position und Höhe der Tableiste">
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index 6a63bc73..a780985d 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -178,7 +178,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey   "c">
 <!ENTITY context.expandAllSubtree.label         "Expand All Trees">
 <!ENTITY context.expandAllSubtree.accesskey     "e">
-<!ENTITY context.toggleAutoHide.label           "Auto hide tab bar">
+<!ENTITY context.toggleAutoHide.label.hide      "Auto hide tab bar">
+<!ENTITY context.toggleAutoHide.label.shrink    "Auto shrink tab bar">
 <!ENTITY context.toggleAutoHide.accesskey       "h">
 <!ENTITY context.toggleFixed.label              "Fix position and width/height of tab bar">
 <!ENTITY context.toggleFixed.label.horizontal   "Fix position and height of tab bar">
diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd
index 8519d53c..8e3de379 100644
--- a/locale/es-ES/treestyletab/treestyletab.dtd
+++ b/locale/es-ES/treestyletab/treestyletab.dtd
@@ -189,7 +189,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey "c">
 <!ENTITY context.expandAllSubtree.label     "Expandir todos los árboles">
 <!ENTITY context.expandAllSubtree.accesskey "e">
-<!ENTITY context.toggleAutoHide.label     "Auto-ocultar la barra de pestañas">
+<!ENTITY context.toggleAutoHide.label.hide     "Auto-ocultar la barra de pestañas">
+<!ENTITY context.toggleAutoHide.label.shrink   "Auto encoger la barra de pestañas">
 <!ENTITY context.toggleAutoHide.accesskey "h">
 <!ENTITY context.toggleFixed.label            "Anclar posición, altura y ancho de la barra de pestañas">
 <!ENTITY context.toggleFixed.label.horizontal "Anclar posición y altura de la barra de pestañas">
diff --git a/locale/fr-FR/treestyletab/treestyletab.dtd b/locale/fr-FR/treestyletab/treestyletab.dtd
index 5d804872..6f7fad53 100644
--- a/locale/fr-FR/treestyletab/treestyletab.dtd
+++ b/locale/fr-FR/treestyletab/treestyletab.dtd
@@ -177,7 +177,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey   "c">
 <!ENTITY context.expandAllSubtree.label         "Déplier toutes les arborescences">
 <!ENTITY context.expandAllSubtree.accesskey     "e">
-<!ENTITY context.toggleAutoHide.label           "Masquage automatique du panneau des onglets">
+<!ENTITY context.toggleAutoHide.label.hide      "Masquage automatique du panneau des onglets">
+<!ENTITY context.toggleAutoHide.label.shrink    "Auto shrink tab bar">
 <!ENTITY context.toggleAutoHide.accesskey       "h">
 <!ENTITY context.toggleFixed.label              "Fixer la position et la largeur/hauteur du panneau des onglets">
 <!ENTITY context.toggleFixed.label.horizontal   "Fixer la position et la hauteur du panneau des onglets">
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index eb4e6563..a11fdb7b 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -187,7 +187,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey "o">
 <!ENTITY context.expandAllSubtree.label     "Espandi tutti i sottoalberi">
 <!ENTITY context.expandAllSubtree.accesskey "E">
-<!ENTITY context.toggleAutoHide.label     "Nascondi automaticamente la barra delle schede">
+<!ENTITY context.toggleAutoHide.label.hide   "Nascondi automaticamente la barra delle schede">
+<!ENTITY context.toggleAutoHide.label.shrink "Riduci automaticamente la barra delle schede">
 <!ENTITY context.toggleAutoHide.accesskey "b">
 <!ENTITY context.toggleFixed.label            "Fix position and width/height of tab bar">
 <!ENTITY context.toggleFixed.label.horizontal "Fix position and height of tab bar">
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index be13147e..45f35344 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -177,7 +177,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey   "c">
 <!ENTITY context.expandAllSubtree.label         "ツリーをすべて展開する">
 <!ENTITY context.expandAllSubtree.accesskey     "e">
-<!ENTITY context.toggleAutoHide.label           "タブバーを自動的に隠す">
+<!ENTITY context.toggleAutoHide.label.hide      "タブバーを自動的に隠す">
+<!ENTITY context.toggleAutoHide.label.shrink    "タブバーを自動的に縮める">
 <!ENTITY context.toggleAutoHide.accesskey       "h">
 <!ENTITY context.toggleFixed.label              "タブバーの位置と幅/高さを固定">
 <!ENTITY context.toggleFixed.label.horizontal   "タブバーの位置と高さを固定">
diff --git a/locale/pl/treestyletab/treestyletab.dtd b/locale/pl/treestyletab/treestyletab.dtd
index 6bece924..a08be901 100644
--- a/locale/pl/treestyletab/treestyletab.dtd
+++ b/locale/pl/treestyletab/treestyletab.dtd
@@ -182,7 +182,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey "T">
 <!ENTITY context.expandAllSubtree.label     "Rozwiń wszystkie drzewa">
 <!ENTITY context.expandAllSubtree.accesskey "Y">
-<!ENTITY context.toggleAutoHide.label     "Ukryj pasek kart">
+<!ENTITY context.toggleAutoHide.label.hide   "Ukryj pasek kart">
+<!ENTITY context.toggleAutoHide.label.shrink "Auto shrink tab bar">
 <!ENTITY context.toggleAutoHide.accesskey "U">
 <!ENTITY context.toggleFixed.label            "Stała pozycja i szerokość/wysokość paska kart">
 <!ENTITY context.toggleFixed.label.horizontal "Stała pozycja i wysokość paska kart">
diff --git a/locale/ru/treestyletab/treestyletab.dtd b/locale/ru/treestyletab/treestyletab.dtd
index 67895fcb..6005e151 100755
--- a/locale/ru/treestyletab/treestyletab.dtd
+++ b/locale/ru/treestyletab/treestyletab.dtd
@@ -183,7 +183,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey "С">
 <!ENTITY context.expandAllSubtree.label     "Развернуть все деревья">
 <!ENTITY context.expandAllSubtree.accesskey "Р">
-<!ENTITY context.toggleAutoHide.label     "Автоскрытие панели вкладок">
+<!ENTITY context.toggleAutoHide.label.hide   "Автоскрытие панели вкладок">
+<!ENTITY context.toggleAutoHide.label.shrink "Автосжатие панели вкладок">
 <!ENTITY context.toggleAutoHide.accesskey "А">
 <!ENTITY context.toggleFixed.label            "Зафиксировать положение и ширину/высоту панели вкладок">
 <!ENTITY context.toggleFixed.label.horizontal "Зафиксировать положение и высоту панели вкладок">
diff --git a/locale/sv-SE/treestyletab/treestyletab.dtd b/locale/sv-SE/treestyletab/treestyletab.dtd
index bc7ccd78..b153eb20 100644
--- a/locale/sv-SE/treestyletab/treestyletab.dtd
+++ b/locale/sv-SE/treestyletab/treestyletab.dtd
@@ -191,7 +191,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey   "M">
 <!ENTITY context.expandAllSubtree.label         "Expandera alla träd">
 <!ENTITY context.expandAllSubtree.accesskey     "E">
-<!ENTITY context.toggleAutoHide.label           "Dölj flikfältet automatiskt">
+<!ENTITY context.toggleAutoHide.label.hide      "Dölj flikfältet automatiskt">
+<!ENTITY context.toggleAutoHide.label.shrink    "Krymp flikfältet automatiskt">
 <!ENTITY context.toggleAutoHide.accesskey       "D">
 <!ENTITY context.toggleFixed.label              "Lås position och bredd/höjd för flikfältet">
 <!ENTITY context.toggleFixed.label.horizontal   "Lås position och höjd för flikfältet">
diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd
index 1b3dd50d..527fcdf6 100644
--- a/locale/zh-CN/treestyletab/treestyletab.dtd
+++ b/locale/zh-CN/treestyletab/treestyletab.dtd
@@ -190,7 +190,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey   "c">
 <!ENTITY context.expandAllSubtree.label         "展开所有树">
 <!ENTITY context.expandAllSubtree.accesskey     "e">
-<!ENTITY context.toggleAutoHide.label           "自动隐藏标签栏">
+<!ENTITY context.toggleAutoHide.label.hide      "自动隐藏标签栏">
+<!ENTITY context.toggleAutoHide.label.shrink    "自动缩小标签栏">
 <!ENTITY context.toggleAutoHide.accesskey       "h">
 <!ENTITY context.toggleFixed.label              "固定标签栏位置／高／宽度">
 <!ENTITY context.toggleFixed.label.horizontal   "固定标签栏位置／高度">
diff --git a/locale/zh-TW/treestyletab/treestyletab.dtd b/locale/zh-TW/treestyletab/treestyletab.dtd
index 247ed9f5..5102cd58 100644
--- a/locale/zh-TW/treestyletab/treestyletab.dtd
+++ b/locale/zh-TW/treestyletab/treestyletab.dtd
@@ -178,7 +178,8 @@
 <!ENTITY context.collapseAllSubtree.accesskey "c">
 <!ENTITY context.expandAllSubtree.label     "展開全部樹目錄">
 <!ENTITY context.expandAllSubtree.accesskey "e">
-<!ENTITY context.toggleAutoHide.label     "自動隱藏分頁工具列">
+<!ENTITY context.toggleAutoHide.label.hide   "自動隱藏分頁工具列">
+<!ENTITY context.toggleAutoHide.label.shrink "自動縮小分頁工具列">
 <!ENTITY context.toggleAutoHide.accesskey "h">
 <!ENTITY context.toggleFixed.label            "固定分頁工具列的位置、寬高">
 <!ENTITY context.toggleFixed.label.horizontal "固定分頁工具列的位置和高度">
diff --git a/modules/autoHide.js b/modules/autoHide.js
index e9f8fc01..782d5042 100644
--- a/modules/autoHide.js
+++ b/modules/autoHide.js
@@ -131,6 +131,14 @@ AutoHideBase.prototype = inherit(AutoHideConstants, {
 		return aValue;
 	},
 
+	get shouldShrink()
+	{
+		var toggleKey = 'tabbar.autoHide.mode.toggle';
+		if (this.window.fullScreen)
+			toggleKey += '.fullscreen';
+		return utils.getTreePref(toggleKey) == this.kMODE_SHRINK;
+	},
+
 	get lastNormalMode()
 	{
 		var lastMode = this.treeStyleTab.getWindowValue(this.kMODE + '-normal');
@@ -810,6 +818,9 @@ AutoHideBrowser.prototype = inherit(AutoHideBase.prototype, {
 			aNode.setAttribute('checked', true);
 		else
 			aNode.removeAttribute('checked');
+
+		var labelAttribute = this.shouldShrink ? 'label-shrink' : 'label-hide' ;
+		aNode.setAttribute('label', aNode.getAttribute(labelAttribute));
 	},
  
 	// show/hide tabbar