Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js
@@ -83,13 +83,15 @@
 		// which takes a few ms, but this could only be done once per frame anyways.
 		// NB: this technically makes it possible to start the game without the change going through
 		// but it's essentially impossible to trigger accidentally.
-		if (this.reRenderTimeout)
-			return;
-		this.reRenderTimeout = setTimeout(() => {
+		let call = () => {
 			g_GameSettings.map.selectMap(this.values.file[itemIdx]);
 			this.gameSettingsController.setNetworkInitAttributes();
 			delete this.reRenderTimeout;
-		}, 0);
+		};
+		if (this.reRenderTimeout)
+			setNewTimerFunction(this.reRenderTimeout, call);
+		else
+			this.reRenderTimeout = setTimeout(call, 0);
 	}
 
 	getAutocompleteEntries()