diff --git a/quakespasm/Quake/menu.c b/quakespasm/Quake/menu.c
index d654a33c..9c3af2f4 100644
--- a/quakespasm/Quake/menu.c
+++ b/quakespasm/Quake/menu.c
@@ -217,8 +217,13 @@ void M_ToggleMenu_f (void)
 			return;
 		}
 
-		IN_Activate();
-		key_dest = (cls.state == ca_connected) ? key_game : key_console;
+		if (cls.state == ca_connected)
+		{
+			IN_Activate();
+			key_dest = key_game;
+		}
+		else
+			key_dest = key_console;
 		m_state = m_none;
 		return;
 	}
@@ -275,8 +280,13 @@ void M_Main_Key (int key)
 	switch (key)
 	{
 	case K_ESCAPE:
-		IN_Activate();
-		key_dest = (cls.state == ca_connected) ? key_game : key_console;
+		if (cls.state == ca_connected)
+		{
+			IN_Activate();
+			key_dest = key_game;
+		}
+		else
+			key_dest = key_console;
 		m_state = m_none;
 		cls.demonum = m_save_demonum;
 		if (!fitzmode)	/* QuakeSpasm customization: */