diff --git a/src/files.c b/src/files.c
index 76190402093bdabedaf4cfcd742d02fedc949c9f..5626c0475fb89d9c50cbffb3b1533e7863944b23 100644
--- a/src/files.c
+++ b/src/files.c
@@ -523,9 +523,9 @@ void do_insertfile(void)
 	if (i == NANO_EXTCMD_KEY) {
 	    int j;
 
+#ifdef ENABLE_MULTIBUFFER
   exec_again:	/* Go here when the user toggles multibuffer mode. */
 
-#ifdef ENABLE_MULTIBUFFER
 	    if (ISSET(MULTIBUFFER))
 		msg = N_("Command to execute in new buffer");
 	    else
diff --git a/src/global.c b/src/global.c
index 2d8522714faef183ab25d33c235e5f7338771dbd..39a1effad8402d75ef3c3d80fefee3315d696530 100644
--- a/src/global.c
+++ b/src/global.c
@@ -247,7 +247,9 @@ void shortcut_init(int unjustify)
     const char *regexp_msg = N_("Regexp");
 #endif
     const char *history_msg = N_("History");
+#ifdef ENABLE_MULTIBUFFER
     const char *new_buffer_msg = N_("New Buffer");
+#endif
 #endif /* !NANO_SMALL */
 #ifndef DISABLE_BROWSER
     const char *to_files_msg = N_("To Files");
@@ -940,10 +942,12 @@ void shortcut_init(int unjustify)
 	IFHELP(nano_cancel_msg, NANO_NO_KEY), NANO_NO_KEY,
 	NANO_NO_KEY, VIEW, 0);
 
+#ifdef ENABLE_MULTIBUFFER
     sc_init_one(&extcmd_list, NANO_NO_KEY, new_buffer_msg,
 	IFHELP(nano_multibuffer_msg, TOGGLE_MULTIBUFFER_KEY), NANO_NO_KEY,
 	NANO_NO_KEY, NOVIEW, 0);
 #endif
+#endif
 
 #ifndef DISABLE_BROWSER
     free_shortcutage(&browser_list);