diff --git a/src/files.c b/src/files.c
index 02d7ca15..81c10732 100644
--- a/src/files.c
+++ b/src/files.c
@@ -661,6 +661,9 @@ void switch_to_adjacent_buffer(bool to_next)
 	/* Ensure that the main loop will redraw the help lines. */
 	currmenu = MMOST;
 
+	/* Prevent a possible Shift selection from getting cancelled. */
+	shift_held = TRUE;
+
 	/* Indicate on the status bar where we switched to. */
 	mention_name_and_linecount();
 }