diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_LobbyInterface.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_LobbyInterface.h
index 81158d369c0..9301e552c07 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_LobbyInterface.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_LobbyInterface.h
@@ -99,7 +99,6 @@ class NGMP_OnlineServices_LobbyInterface
 {
 public:
 	NGMP_OnlineServices_LobbyInterface();
-	void StopMatchStartCountdownIfRunning();
 	void SearchForLobbies(std::function<void()> onStartCallback, std::function<void(std::vector<LobbyEntry>)> onCompleteCallback);
 	void DeregisterForSearchForLobbiesCallback()
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
index f005607402d..803ac929c99 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
@@ -985,6 +985,11 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 	// Show Menu
 	layout->hide( FALSE );
 
+	// Show the QM setup menu by default
+	hideInfoGadgets(TRUE);
+	hideOptionsGadgets(FALSE);
+	GadgetButtonSetText(TheWindowManager->winGetWindowFromId(parentWOLQuickMatch, NAMEKEY("WOLQuickMatchMenu.wnd:ButtonOptions")), TheGameText->fetch("GUI:PlayerInfo"));
+
 	// Set Keyboard to Main Parent
 	TheWindowManager->winSetFocus( parentWOLQuickMatch );