diff --git a/src/m_cheat.c b/src/m_cheat.c
index 953d0f350..c94699a93 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -83,10 +83,31 @@ static UINT8 cheatf_warp(void)
 	if (success)
 	{
 		G_SetUsedCheats();
+		M_ClearMenus(true);
 		S_StartSound(0, sfx_kc42);
-	}
 
-	M_StartMessage(M_GetText("TOURNAMENT MODE ENGAGED!!\n\nIs what I would be saying if I actually\nimplemented anything special here.\n\nPress (B)\n"), NULL, MM_NOTHING);
+		M_StartMessage(M_GetText(
+			"TOURNAMENT MODE\n\
+			\nAll challenges temporarily unlocked.\n\
+			Saving is disabled - the game will\n\
+			return to normal on next launch.\n\
+			\n\
+			Press (B)\n"
+		), NULL, MM_NOTHING);
+	}
+	else
+	{
+		S_StartSound(0, sfx_s3k7b);
+
+		M_StartMessage(M_GetText(
+			"TOURNAMENT MODE\n\
+			\nThis is the correct password, but.\n\
+			you already have every challenge\n\
+			unlocked, so saving is still allowed!\n\
+			\n\
+			Press (B)\n"
+		), NULL, MM_NOTHING);
+	}
 
 	return 1;
 }
diff --git a/src/menus/extras-1.c b/src/menus/extras-1.c
index 4331743b6..5e11a6121 100644
--- a/src/menus/extras-1.c
+++ b/src/menus/extras-1.c
@@ -180,7 +180,7 @@ void M_ExtrasTick(void)
 				M_Challenges(0);
 			}
 		}
-		else if (cht_Interpret(cv_dummyextraspassword.string) == true)
+		else if (cht_Interpret(cv_dummyextraspassword.string) == true && menuactive == true)
 		{
 			M_InitExtras(-1);
 		}