diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index d0507ee2..1caaaf7e 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -336,8 +336,8 @@
 		<preference id="extensions.treestyletab.tabbar.autoHide.enabled"
 			name="extensions.treestyletab.tabbar.autoHide.enabled"
 			type="bool"/>
-		<preference id="extensions.treestyletab.tabbar.autoShow.ctrlKeyDown"
-			name="extensions.treestyletab.tabbar.autoShow.ctrlKeyDown"
+		<preference id="extensions.treestyletab.tabbar.autoShow.accelKeyDown"
+			name="extensions.treestyletab.tabbar.autoShow.accelKeyDown"
 			type="bool"/>
 		<preference id="extensions.treestyletab.tabbar.autoShow.tabSwitch"
 			name="extensions.treestyletab.tabbar.autoShow.tabSwitch"
@@ -354,9 +354,9 @@
 			label="&config.tabbar.autoHide.enabled;"/>
 		<groupbox orient="vertical">
 			<caption label="&config.tabbar.autoShow.caption;"/>
-			<checkbox id="extensions.treestyletab.tabbar.autoShow.ctrlKeyDown-check"
-				preference="extensions.treestyletab.tabbar.autoShow.ctrlKeyDown"
-				label="&config.tabbar.autoShow.ctrlKeyDown;"/>
+			<checkbox id="extensions.treestyletab.tabbar.autoShow.accelKeyDown-check"
+				preference="extensions.treestyletab.tabbar.autoShow.accelKeyDown"
+				label="&config.tabbar.autoShow.accelKeyDown;"/>
 			<checkbox id="extensions.treestyletab.tabbar.autoShow.tabSwitch-check"
 				preference="extensions.treestyletab.tabbar.autoShow.tabSwitch"
 				label="&config.tabbar.autoShow.tabSwitch;"/>
diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index fedd8462..c980d2b4 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -1257,21 +1257,24 @@ catch(e) {
 			!aEvent.altKey &&
 			(navigator.platform.match(/mac/i) ? aEvent.metaKey : aEvent.ctrlKey )
 			) {
-			if (this.getTreePref('tabbar.autoShow.ctrlKeyDown') && 
+			if (this.getTreePref('tabbar.autoShow.accelKeyDown') && 
 				!sv.tabbarShown) {
 				this.delayedAutoShowTimer = window.setTimeout(
 					function(aSelf) {
 						aSelf.delayedAutoShowDone = true;
+						aSelf.accelKeyPressed = true;
 						sv.showTabbar(sv.kSHOWN_BY_SHORTCUT);
 					},
-					this.getTreePref('tabbar.autoShow.ctrlKeyDown.delay'),
+					this.getTreePref('tabbar.autoShow.accelKeyDown.delay'),
 					this
 				);
 				this.delayedAutoShowDone = false;
 			}
 		}
-		else
+		else {
+			this.accelKeyPressed = false;
 			sv.hideTabbar();
+		}
 	},
 	cancelDelayedAutoShow : function()
 	{
@@ -1282,6 +1285,7 @@ catch(e) {
 	},
 	delayedAutoShowTimer : null,
 	delayedAutoShowDone : true,
+	accelKeyPressed : false,
  
 	onKeyRelease : function(aEvent) 
 	{
@@ -1318,11 +1322,13 @@ catch(e) {
 				aEvent.charCode == 0 && aEvent.keyCode == 16
 			)
 			) {
-dump('show/onKeyRelease\n');
+			this.accelKeyPressed = true;
 			sv.showTabbar(sv.kSHOWN_BY_SHORTCUT);
 			return;
 		}
 
+		this.accelKeyPressed = false;
+
 		if (sv.showHideTabbarReason == sv.kSHOWN_BY_SHORTCUT)
 			sv.hideTabbar();
 	},
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 450b9bb3..e4412a56 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -1442,7 +1442,8 @@ TreeStyleTabBrowser.prototype = {
 
 		this.updateInvertedTabContentsOrder();
 
-		this.showTabbarForFeedback();
+		if (!this.accelKeyPressed)
+			this.showTabbarForFeedback();
 	},
  
 	onTabClick : function(aEvent) 
diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js
index 2005d469..da1cbdee 100644
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@@ -11,8 +11,8 @@ pref("extensions.treestyletab.tabbar.autoHide.enabled",    false);
 pref("extensions.treestyletab.tabbar.autoHide.delay",      50);
 pref("extensions.treestyletab.tabbar.autoHide.area",       25);
 pref("extensions.treestyletab.tabbar.autoHide.expandArea", false);
-pref("extensions.treestyletab.tabbar.autoShow.ctrlKeyDown", true);
-pref("extensions.treestyletab.tabbar.autoShow.ctrlKeyDown.delay", 800);
+pref("extensions.treestyletab.tabbar.autoShow.accelKeyDown", true);
+pref("extensions.treestyletab.tabbar.autoShow.accelKeyDown.delay", 800);
 pref("extensions.treestyletab.tabbar.autoShow.tabSwitch", true);
 pref("extensions.treestyletab.tabbar.autoShow.feedback", true);
 pref("extensions.treestyletab.tabbar.autoShow.feedback.delay", 3000);
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index a121ee8c..8db1653d 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -72,7 +72,7 @@
 
 <!ENTITY config.tabbar.autoHide.enabled     "Auto hide tab bar">
 <!ENTITY config.tabbar.autoShow.caption "Show tab bar automatically when">
-<!ENTITY config.tabbar.autoShow.ctrlKeyDown "Control(Command) key is pressed a while">
+<!ENTITY config.tabbar.autoShow.accelKeyDown "Control(Command) key is pressed a while">
 <!ENTITY config.tabbar.autoShow.tabSwitch   "Control(Command)-Tab to switch tabs">
 <!ENTITY config.tabbar.autoShow.feedback    "Nwe tabs are opened or some tabs are closed">
 
diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd
index 98316874..2bb85e09 100644
--- a/locale/es-ES/treestyletab/treestyletab.dtd
+++ b/locale/es-ES/treestyletab/treestyletab.dtd
@@ -72,7 +72,7 @@
 
 <!ENTITY config.tabbar.autoHide.enabled     "Auto-ocultar la barra de pestañas">
 <!ENTITY config.tabbar.autoShow.caption "Show tab bar automatically when">
-<!ENTITY config.tabbar.autoShow.ctrlKeyDown "Control(Command) key is pressed a while">
+<!ENTITY config.tabbar.autoShow.accelKeyDown "Control(Command) key is pressed a while">
 <!ENTITY config.tabbar.autoShow.tabSwitch   "Control(Command)-Tab to switch tabs">
 <!ENTITY config.tabbar.autoShow.feedback    "Nwe tabs are opened or some tabs are closed">
 
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index 4b135db2..f29e7b5e 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -72,7 +72,7 @@
 
 <!ENTITY config.tabbar.autoHide.enabled     "Nascondi automaticamente la barra delle schede">
 <!ENTITY config.tabbar.autoShow.caption "Show tab bar automatically when">
-<!ENTITY config.tabbar.autoShow.ctrlKeyDown "Control(Command) key is pressed a while">
+<!ENTITY config.tabbar.autoShow.accelKeyDown "Control(Command) key is pressed a while">
 <!ENTITY config.tabbar.autoShow.tabSwitch   "Control(Command)-Tab to switch tabs">
 <!ENTITY config.tabbar.autoShow.feedback    "Nwe tabs are opened or some tabs are closed">
 
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index 82bc93c8..5317971f 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -72,7 +72,7 @@
 
 <!ENTITY config.tabbar.autoHide.enabled "タブバーを自動的に隠す">
 <!ENTITY config.tabbar.autoShow.caption "以下の場合に自動的にタブバーを表示する">
-<!ENTITY config.tabbar.autoShow.ctrlKeyDown "Control(Command)キーを長押しした時">
+<!ENTITY config.tabbar.autoShow.accelKeyDown "Control(Command)キーを長押しした時">
 <!ENTITY config.tabbar.autoShow.tabSwitch   "Control(Command)-Tabでタブを切り替える時">
 <!ENTITY config.tabbar.autoShow.feedback    "新しいタブが開かれたりタブが閉じられたりした時">
 
diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd
index e5f751f4..a6830a92 100644
--- a/locale/zh-CN/treestyletab/treestyletab.dtd
+++ b/locale/zh-CN/treestyletab/treestyletab.dtd
@@ -72,7 +72,7 @@
 
 <!ENTITY config.tabbar.autoHide.enabled     "自动隐藏标签栏">
 <!ENTITY config.tabbar.autoShow.caption "Show tab bar automatically when">
-<!ENTITY config.tabbar.autoShow.ctrlKeyDown "Control(Command) key is pressed a while">
+<!ENTITY config.tabbar.autoShow.accelKeyDown "Control(Command) key is pressed a while">
 <!ENTITY config.tabbar.autoShow.tabSwitch   "Control(Command)-Tab to switch tabs">
 <!ENTITY config.tabbar.autoShow.feedback    "Nwe tabs are opened or some tabs are closed">