diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 90e2345898..05b42f937b 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -333,7 +333,6 @@ struct GameOptionsWindow : Window {
 				CheckForMissingGlyphsInLoadedLanguagePack();
 				UpdateAllStationVirtCoords();
 				ReInitAllWindows();
-				MarkWholeScreenDirty();
 				break;
 
 			case GOW_RESOLUTION_DROPDOWN: // Change resolution
diff --git a/src/window.cpp b/src/window.cpp
index 60519f3ee5..2f79cdc77f 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2556,6 +2556,10 @@ void ReInitAllWindows()
 	FOR_ALL_WINDOWS_FROM_BACK(w) {
 		w->ReInit();
 	}
+
+	/* Make sure essential parts of all windows are visible */
+	RelocateAllWindows(_cur_resolution.width, _cur_resolution.height);
+	MarkWholeScreenDirty();
 }
 
 /**