diff --git a/src/menus/extras-addons.c b/src/menus/extras-addons.c
index 0d2dbd85b..da76abc09 100644
--- a/src/menus/extras-addons.c
+++ b/src/menus/extras-addons.c
@@ -351,7 +351,7 @@ void M_HandleAddons(INT32 choice)
 		//MainMenu[secrets].status = (M_AnySecretUnlocked()) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
 
 		if (currentMenu->prevMenu)
-			M_SetupNextMenu(currentMenu->prevMenu, false);
+			M_SetupNextMenu(M_InterruptMenuWithChallenges(currentMenu->prevMenu), false);
 		else
 			M_ClearMenus(true);
 
diff --git a/src/menus/extras-challenges.c b/src/menus/extras-challenges.c
index 05481d8e5..ad896b49d 100644
--- a/src/menus/extras-challenges.c
+++ b/src/menus/extras-challenges.c
@@ -205,6 +205,9 @@ menu_t *M_InterruptMenuWithChallenges(menu_t *desiredmenu)
 {
 	UINT16 i, newunlock;
 
+	if (Playing())
+		return desiredmenu;
+
 	M_UpdateUnlockablesAndExtraEmblems(false, true);
 
 	newunlock = M_GetNextAchievedUnlock();