diff --git a/help/4.php b/help/4.php
index 35f4baf1f..0631ef17a 100644
--- a/help/4.php
+++ b/help/4.php
@@ -20,6 +20,7 @@
 
 	<table>
 		<tr><td class='n'>c s</td><td><?php echo __("Subscribe to feed") ?></td></tr>
+		<tr><td class='n'>c c</td><td><?php echo __("Edit feed categories") ?></td></tr>
 		<tr><td class='n'>c f</td><td><?php echo __("Create filter") ?></td></tr>
 		<tr><td class='n'>c l</td><td><?php echo __("Create label") ?></td></tr>
 		<!-- <tr><td class='n'>c u</td><td><?php echo __("Create user") ?></td></tr> -->
diff --git a/prefs.js b/prefs.js
index 6dcf412ab..8c0b84127 100644
--- a/prefs.js
+++ b/prefs.js
@@ -787,9 +787,8 @@ function feedEditCancel() {
 		return
 	}
 
-	document.getElementById("subscribe_to_feed_btn").disabled = false;
-
 	try {
+		document.getElementById("subscribe_to_feed_btn").disabled = false;
 		document.getElementById("top25_feeds_btn").disabled = false;
 	} catch (e) {
 		// this button is not always available, no-op if not found
@@ -876,11 +875,13 @@ function labelEditCancel() {
 		return
 	}
 
-	document.getElementById("label_create_btn").disabled = false;
+	try {
+		document.getElementById("label_create_btn").disabled = false;
+		selectPrefRows('label', false); // cleanup feed selection
+	} catch (e) { }
 
 	active_label = false;
 
-	selectPrefRows('label', false); // cleanup feed selection
 	closeInfoBox();
 
 	return false;
@@ -906,9 +907,11 @@ function filterEditCancel() {
 		return
 	}
 
-	document.getElementById("create_filter_btn").disabled = false;
-	
-	selectPrefRows('filter', false); // cleanup feed selection
+	try {
+		document.getElementById("create_filter_btn").disabled = false;
+		selectPrefRows('filter', false); // cleanup feed selection
+	} catch (e) { }
+
 	closeInfoBox();
 
 	return false;
@@ -1766,6 +1769,10 @@ function pref_hotkey_handler(e) {
 				// no-op
 			}
 
+			if (keycode == 67) { // c
+				return editFeedCats();
+			}
+
 		}
 
 		/* Prefix g */