diff --git a/ChangeLog b/ChangeLog
index 4831f394..cb0044c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@ CVS code -
 	  file if uncutting leaves the cursor on the current one, as
 	  it's actually a bug. (DLR)
 - global.c:
+  shortcut_init()
+	- Fix misplaced #endif keeping the "Full Justify" shortcut in
+	  the search shortcut list from being included when NANO_SMALL
+	  is defined but DISABLE_JUSTIFY isn't. (DLR)
   thanks_for_all_the_fish()
 	- Free the justify buffer if it isn't empty. (DLR)
 - nano.c:
diff --git a/src/global.c b/src/global.c
index 761d2e09..3fbbb4cb 100644
--- a/src/global.c
+++ b/src/global.c
@@ -659,6 +659,7 @@ void shortcut_init(bool 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);
+#endif /* !NANO_SMALL */
 
 #ifndef DISABLE_JUSTIFY
     /* Translators: try to keep this string under 10 characters long */
@@ -666,7 +667,6 @@ void shortcut_init(bool unjustify)
 	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);