diff --git a/src/g_game.c b/src/g_game.c
index fce9919f197d8fd99fc2ed37c3da7232f6b033b1..4140a91eba99711940d2301aa06dc532d0a08f58 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2080,7 +2080,7 @@ boolean G_Responder(event_t *ev)
 	if (gameaction == ga_nothing && !singledemo &&
 		((demoplayback && !modeattacking && !titledemo) || gamestate == GS_TITLESCREEN))
 	{
-		if (ev->type == ev_keydown && ev->key != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE && cv_tutorialprompt.value))
+		if (ev->type == ev_keydown && ev->key != 301 && !(gamestate == GS_TITLESCREEN && finalecount < (cv_tutorialprompt.value ? TICRATE : 0)))
 		{
 			M_StartControlPanel();
 			return true;
diff --git a/src/m_menu.c b/src/m_menu.c
index 81ff0f67958658d5f19374b6a46cc0485c9c5b5e..f7b65910da2708cb634f7d5104386df4d5a1130c 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -3196,7 +3196,7 @@ boolean M_Responder(event_t *ev)
 	|| gamestate == GS_CREDITS || gamestate == GS_EVALUATION || gamestate == GS_GAMEEND)
 		return false;
 
-	if (gamestate == GS_TITLESCREEN && finalecount < TICRATE && cv_tutorialprompt.value)
+	if (gamestate == GS_TITLESCREEN && finalecount < (cv_tutorialprompt.value ? TICRATE : 0))
 		return false;
 
 	if (CON_Ready() && gamestate != GS_WAITINGPLAYERS)