diff --git a/Quake/host_cmd.c b/Quake/host_cmd.c
index ba7ee6d1..106311af 100644
--- a/Quake/host_cmd.c
+++ b/Quake/host_cmd.c
@@ -849,7 +849,10 @@ static void Host_Map_f (void)
 	CL_Disconnect ();
 	Host_ShutdownServer(false);
 
-	key_dest = key_game;			// remove console or menu
+	if (key_dest == key_menu)
+		M_ToggleMenu(0);	//ask the menu to hide itself so we don't get pooped by our poor tracking of input state on the next line.
+	else
+		key_dest = key_game;			// remove console or menu
 	if (cls.state != ca_dedicated)
 		IN_UpdateGrabs();
 	SCR_BeginLoadingPlaque ();