diff --git a/src/window.cpp b/src/window.cpp
index 9f215d4593..64c96d16aa 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2761,8 +2761,10 @@ static void HandleKeyScrolling()
 	if (_dirkeys && !EditBoxInGlobalFocus()) {
 		int factor = _shift_pressed ? 50 : 10;
 
-		/* Key scrolling stops following a vehicle. */
-		GetMainWindow()->viewport->follow_vehicle = INVALID_VEHICLE;
+		if (_game_mode != GM_MENU && _game_mode != GM_BOOTSTRAP) {
+			/* Key scrolling stops following a vehicle. */
+			GetMainWindow()->viewport->follow_vehicle = INVALID_VEHICLE;
+		}
 
 		ScrollMainViewport(scrollamt[_dirkeys][0] * factor, scrollamt[_dirkeys][1] * factor);
 	}