diff --git a/src/window.cpp b/src/window.cpp
index ad1a817cdc..870371c9ba 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1332,6 +1332,15 @@ static uint GetWindowZPriority(WindowClass wc)
 	uint z_priority = 0;
 
 	switch (wc) {
+		case WC_TOOLTIPS:
+			++z_priority;
+			FALLTHROUGH;
+
+		case WC_ERRMSG:
+		case WC_CONFIRM_POPUP_QUERY:
+			++z_priority;
+			FALLTHROUGH;
+
 		case WC_ENDSCREEN:
 			++z_priority;
 			FALLTHROUGH;
@@ -1340,10 +1349,6 @@ static uint GetWindowZPriority(WindowClass wc)
 			++z_priority;
 			FALLTHROUGH;
 
-		case WC_TOOLTIPS:
-			++z_priority;
-			FALLTHROUGH;
-
 		case WC_DROPDOWN_MENU:
 			++z_priority;
 			FALLTHROUGH;
@@ -1362,8 +1367,6 @@ static uint GetWindowZPriority(WindowClass wc)
 			++z_priority;
 			FALLTHROUGH;
 
-		case WC_ERRMSG:
-		case WC_CONFIRM_POPUP_QUERY:
 		case WC_NETWORK_ASK_RELAY:
 		case WC_MODAL_PROGRESS:
 		case WC_NETWORK_STATUS_WINDOW: