diff --git a/src/window.cpp b/src/window.cpp
index 1abb7f4634..2468c50104 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -914,7 +914,12 @@ static uint GetWindowZPriority(const Window *w)
 			++z_priority;
 
 		case WC_SAVELOAD:
+		case WC_GAME_OPTIONS:
 		case WC_NETWORK_WINDOW:
+		case WC_GRF_PARAMETERS:
+		case WC_NEWGRF_TEXTFILE:
+		case WC_AI_LIST:
+		case WC_AI_SETTINGS:
 			++z_priority;
 
 		case WC_CONSOLE: