diff --git a/help/3.php b/help/3.php
index 009376f5d..c7a321b9d 100644
--- a/help/3.php
+++ b/help/3.php
@@ -16,7 +16,7 @@
 		<tr><td class='n'>s</td><td><?php echo __("Toggle starred") ?></td></tr>
 		<tr><td class='n'>shift-S</td><td><?php echo __("Toggle published") ?></td></tr>
 		<tr><td class='n'>u</td><td><?php echo __("Toggle unread") ?></td></tr>
-		<tr><td class='n'>t</td><td><?php echo __("Edit tags") ?></td></tr>
+		<tr><td class='n'>T</td><td><?php echo __("Edit tags") ?></td></tr>
 		<tr><td class='n'>o</td><td><?php echo __("Open article in new window") ?></td></tr>
 	</table>
 
diff --git a/tt-rss.js b/tt-rss.js
index dd148b3d0..859b98120 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -1145,7 +1145,7 @@ function hotkey_handler(e) {
 				return viewfeed(-3);
 			}
 
-			if (keycode == 84) { // t
+			if (keycode == 84 && shift_key) { // T
 				toggleTags();
 			}