diff --git a/ChangeLog b/ChangeLog
index 1a916ea3449ca0480eafd06b23eec16576b942bf..c2caf3e48c21a720ce88c41da495a58ffcfd7d35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-08  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init): Allow exiting from the file browser
+	with the same key (^T) as it was entered (as ^G for the help viewer).
+
 2015-11-07  Benno Schulenberg  <bensberg@justemail.net>
 	* src/search.c (do_replace_loop): Correct the logic for adjusting the
 	x position of the mark -- it happened to work because 'mark_begin' is
diff --git a/src/global.c b/src/global.c
index 0c7b63fe9da9fb3d17edb7d85ddf8188a7488dc8..15dbbbfb9729414677b2f813ef6ffe144c40e0ef 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1206,6 +1206,11 @@ void shortcut_init(void)
 	add_to_sclist(MINSERTFILE|MEXTCMD, "M-F", new_buffer_void, 0);
     }
     add_to_sclist(MHELP|MBROWSER, "^C", do_exit, 0);
+    /* Allow exiting from the file browser and the help viewer with
+     * the same key as they were entered. */
+#ifndef DISABLE_BROWSER
+    add_to_sclist(MBROWSER, "^T", do_exit, 0);
+#endif
 #ifndef DISABLE_HELP
     add_to_sclist(MHELP, "^G", do_exit, 0);
     add_to_sclist(MHELP, "Home", do_first_line, 0);