diff --git a/Quake/host_cmd.c b/Quake/host_cmd.c
index 04046917..e44edc4b 100644
--- a/Quake/host_cmd.c
+++ b/Quake/host_cmd.c
@@ -2138,14 +2138,6 @@ void Host_Startdemos_f (void)
 		return;
 	}
 
-	if (!fitzmode)
-	{ /* QuakeSpasm customization: */
-		cls.demonum = -1;
-		/* go straight to menu */
-		Cbuf_InsertText("menu_main");
-		return;
-	}
-
 	c = Cmd_Argc() - 1;
 	if (c > MAX_DEMOS)
 	{
@@ -2160,10 +2152,18 @@ void Host_Startdemos_f (void)
 	if (!sv.active && cls.demonum != -1 && !cls.demoplayback)
 	{
 		cls.demonum = 0;
+		if (!fitzmode)
+		{  /* QuakeSpasm customization: */
+			/* go straight to menu, no CL_NextDemo */
+			Cbuf_InsertText("menu_main");
+			return;
+		}
 		CL_NextDemo ();
 	}
 	else
+	{
 		cls.demonum = -1;
+	}
 }
 
 
diff --git a/Quake/menu.c b/Quake/menu.c
index 14a5f292..0e8f0281 100644
--- a/Quake/menu.c
+++ b/Quake/menu.c
@@ -305,6 +305,8 @@ void M_Main_Key (int key)
 		key_dest = key_game;
 		m_state = m_none;
 		cls.demonum = m_save_demonum;
+		if (!fitzmode)	/* QuakeSpasm customization: */
+			break;
 		if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
 			CL_NextDemo ();
 		break;