diff --git a/ChangeLog b/ChangeLog
index ad7274c5825fa2727b0e6c03c19f463b67dea754..7a9cb54e96cf19fbe2fc7330ddb291818c63f6a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-06  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init): Limit M-T (cut-till-end) to the main
+	menu, and M-J (full-justify) to the main and search menus.
+
 2014-04-05  Benno Schulenberg  <bensberg@justemail.net>
 	* src/nano.c (version): Print the correct configuration options.
 	* src/{chars.c,nano.c,text.c}: Cosmetic tweaks.
diff --git a/src/global.c b/src/global.c
index 74bb0d5cf18cdeba5a7ef40db0803466e26ab40e..d0aaa1417cc3359ce0154beb58e6a111cffd5333 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1229,14 +1229,15 @@ void shortcut_init(bool unjustify)
     add_to_sclist(MMAIN, "M->", switch_to_next_buffer_void, 0, TRUE);
     add_to_sclist(MMAIN, "M-.", switch_to_next_buffer_void, 0, TRUE);
 #endif
-    add_to_sclist(MALL, "M-V", do_verbatim_input, 0, TRUE);
 
+    add_to_sclist(MALL, "M-V", do_verbatim_input, 0, TRUE);
 #ifndef NANO_TINY
-    add_to_sclist(MALL, "M-T", do_cut_till_end, 0, TRUE);
+    add_to_sclist(MMAIN, "M-T", do_cut_till_end, 0, TRUE);
 #ifndef DISABLE_JUSTIFY
-    add_to_sclist(MALL, "M-J", do_full_justify, 0, TRUE);
+    add_to_sclist(MMAIN|MWHEREIS, "M-J", do_full_justify, 0, TRUE);
 #endif
     add_to_sclist(MMAIN, "M-D", do_wordlinechar_count, 0, TRUE);
+
     add_to_sclist(MMAIN, "M-X", do_toggle_void, NO_HELP, TRUE);
     add_to_sclist(MMAIN, "M-C", do_toggle_void, CONST_UPDATE, TRUE);
     add_to_sclist(MMAIN, "M-O", do_toggle_void, MORE_SPACE, TRUE);