diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 9afcda105d..b1f0b7b79e 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -337,7 +337,7 @@ function handleNetMessage(message)
 		{
 		case "disconnected":
 			Engine.DisconnectNetworkGame();
-			Engine.PopGuiPage();
+			Engine.SwitchGuiPage("page_pregame.xml")();
 			reportDisconnect(message.reason);
 			break;
 
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
index 871123adb6..f94cdb9a7a 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -308,7 +308,7 @@
 			<action on="Press">
 				<![CDATA[
 					cancelSetup();
-					Engine.PopGuiPage();
+					Engine.SwitchGuiPage("page_pregame.xml");
 				]]>
 			</action>
 		</object>
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js
index d690a34353..a27c993900 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup_mp.js
@@ -118,8 +118,7 @@ function onTick()
 					}
 					else
 					{
-						Engine.PopGuiPage();
-						Engine.PushGuiPage("page_gamesetup.xml", { "type": g_GameType });
+						Engine.SwitchGuiPage("page_gamesetup.xml", { "type": g_GameType });
 						return; // don't process any more messages - leave them for the game GUI loop
 					}
 
diff --git a/binaries/data/mods/public/gui/pregame/mainmenu.xml b/binaries/data/mods/public/gui/pregame/mainmenu.xml
index 582559eeef..837f6bfa7c 100644
--- a/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ b/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -169,8 +169,7 @@ Status: $status.
 				>
 					Matches
 					<action on="Press">
-						closeMenu();
-						Engine.PushGuiPage("page_gamesetup.xml", { type: "offline" });
+						Engine.SwitchGuiPage("page_gamesetup.xml", { type: "offline" });
 					</action>
 				</object>