diff --git a/functions.js b/functions.js
index 3d3b34b38..b41cd73ab 100644
--- a/functions.js
+++ b/functions.js
@@ -209,7 +209,10 @@ function hotkey_handler(e) {
 
 		}
 	
-		if (!hotkeys_enabled) return;
+		if (!hotkeys_enabled) {
+			debug("hotkeys disabled");
+			return;
+		}
 	
 		if (window.event) {
 			keycode = window.event.keyCode;
diff --git a/tt-rss.js b/tt-rss.js
index c1a812aa5..a4588c347 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -634,8 +634,6 @@ function catchupCurrentFeed() {
 function editFeedDlg(feed) {
 	try {
 
-		disableHotkeys();
-	
 		if (!feed) {
 			alert(__("Please select some feed first."));
 			return;
@@ -653,7 +651,9 @@ function editFeedDlg(feed) {
 		} else {
 			query = "backend.php?op=pref-labels&subop=edit&id=" +	param_escape(-feed-11);
 		}
-	
+
+		disableHotkeys();
+
 		new Ajax.Request(query, {
 			onComplete: function(transport) { 
 				infobox_callback2(transport);