diff --git a/ChangeLog b/ChangeLog
index ddea5d5a..69930812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -171,6 +171,9 @@ CVS code -
 	- Leave "Mark Text" and "Where Is Next" out entirely when
 	  NANO_SMALL is defined.  Since they aren't in the visible main
 	  list, there's no point in having them in but disabled. (DLR)
+	- In the search prompt shortcut list, move "Full Justify" to
+	  after "History", so that the latter is visible onscreen
+	  again. (DLR)
 - nano.c:
   die_save_file()
 	- Clarify the error message when there are too many backup files
diff --git a/src/global.c b/src/global.c
index 9dff642a..b17b5ecb 100644
--- a/src/global.c
+++ b/src/global.c
@@ -629,11 +629,6 @@ void shortcut_init(int unjustify)
     sc_init_one(&whereis_list, NANO_PARAEND_KEY, end_of_par_msg,
 	IFHELP(nano_paraend_msg, NANO_PARAEND_ALTKEY1), NANO_NO_KEY,
 	NANO_PARAEND_ALTKEY2, VIEW, do_para_end);
-
-    /* Translators: try to keep this string under 10 characters long */
-    sc_init_one(&whereis_list, NANO_FULLJUSTIFY_KEY, fulljstify_msg,
-	IFHELP(nano_fulljustify_msg, NANO_FULLJUSTIFY_ALTKEY),
-	NANO_NO_KEY, NANO_NO_KEY, NOVIEW, do_full_justify);
 #endif
 
 #ifndef NANO_SMALL
@@ -658,6 +653,13 @@ void shortcut_init(int unjustify)
     sc_init_one(&whereis_list, NANO_HISTORY_KEY, history_msg,
 	IFHELP(nano_editstr_msg, NANO_NO_KEY), NANO_NO_KEY,
 	NANO_NO_KEY, VIEW, 0);
+
+#ifndef DISABLE_JUSTIFY
+    /* Translators: try to keep this string under 10 characters long */
+    sc_init_one(&whereis_list, NANO_FULLJUSTIFY_KEY, fulljstify_msg,
+	IFHELP(nano_fulljustify_msg, NANO_FULLJUSTIFY_ALTKEY),
+	NANO_NO_KEY, NANO_NO_KEY, NOVIEW, do_full_justify);
+#endif
 #endif /* !NANO_SMALL */
 
     free_shortcutage(&replace_list);