diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 7f9c2ef21..13d0a67d6 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1999,6 +1999,8 @@ static void CL_ConnectToServer(void)
 
 	DEBFILE(va("waiting %d nodes\n", doomcom->numnodes));
 	G_SetGamestate(GS_WAITINGPLAYERS);
+	if (wipegamestate == GS_MENU)
+		M_ClearMenus(true);
 	wipegamestate = GS_WAITINGPLAYERS;
 
 	ClearAdminPlayers();
diff --git a/src/g_game.c b/src/g_game.c
index 31b5b2d15..9760197b9 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1286,6 +1286,8 @@ void G_DoLoadLevel(boolean resetplayer)
 		titlemapinaction = TITLEMAP_OFF;
 
 	G_SetGamestate(GS_LEVEL);
+	if (wipegamestate == GS_MENU)
+		M_ClearMenus(true);
 	I_UpdateMouseGrab();
 
 	for (i = 0; i < MAXPLAYERS; i++)