diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 93a91a3ff..993afcb87 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2031,9 +2031,8 @@ static void CL_ConnectToServer(void)
 		Y_EndVote();
 
 	DEBFILE(va("waiting %d nodes\n", doomcom->numnodes));
+	M_ClearMenus(true);
 	G_SetGamestate(GS_WAITINGPLAYERS);
-	if (wipegamestate == GS_MENU)
-		M_ClearMenus(true);
 	wipegamestate = GS_WAITINGPLAYERS;
 
 	ClearAdminPlayers();
@@ -2347,7 +2346,6 @@ static void Command_connect(void)
 		SplitScreen_OnChange();
 	}
 
-	M_ClearMenus(true);
 	CL_ConnectToServer();
 }
 #endif
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index 753a9b767..65047c372 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -3844,7 +3844,6 @@ void M_JoinIP(const char *ipa)
 	}
 
 	COM_BufAddText(va("connect \"%s\"\n", ipa));
-	M_ClearMenus(true);
 
 	// A little "please wait" message.
 	M_DrawTextBox(56, BASEVIDHEIGHT/2-12, 24, 2);