diff --git a/src/date.cpp b/src/date.cpp
index b8b736382a..c08660924f 100644
--- a/src/date.cpp
+++ b/src/date.cpp
@@ -291,7 +291,7 @@ void IncreaseDate()
 	/* increase day, and check if a new day is there? */
 	_tick_counter++;
 
-	if (_game_mode == GM_MENU) return;
+	if (_game_mode == GM_MENU || _game_mode == GM_BOOTSTRAP) return;
 
 	_date_fract++;
 	if (_date_fract < DAY_TICKS) return;
diff --git a/src/window.cpp b/src/window.cpp
index 2400c6999d..1824278c12 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2751,7 +2751,7 @@ static int _input_events_this_tick = 0;
  */
 static void HandleAutoscroll()
 {
-	if (_game_mode == GM_MENU || HasModalProgress()) return;
+	if (_game_mode == GM_MENU || _game_mode == GM_BOOTSTRAP || HasModalProgress()) return;
 	if (_settings_client.gui.auto_scrolling == VA_DISABLED) return;
 	if (_settings_client.gui.auto_scrolling == VA_MAIN_VIEWPORT_FULLSCREEN && !_fullscreen) return;
 
@@ -2797,7 +2797,7 @@ extern EventState VpHandlePlaceSizingDrag();
 
 static void ScrollMainViewport(int x, int y)
 {
-	if (_game_mode != GM_MENU) {
+	if (_game_mode != GM_MENU && _game_mode != GM_BOOTSTRAP) {
 		Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
 		assert(w);
 
@@ -2877,7 +2877,7 @@ static void MouseLoop(MouseClick click, int mousewheel)
 	ViewPort *vp = IsPtInWindowViewport(w, x, y);
 
 	/* Don't allow any action in a viewport if either in menu or when having a modal progress window */
-	if (vp != NULL && (_game_mode == GM_MENU || HasModalProgress())) return;
+	if (vp != NULL && (_game_mode == GM_MENU || _game_mode == GM_BOOTSTRAP || HasModalProgress())) return;
 
 	if (mousewheel != 0) {
 		/* Send mousewheel event to window */