diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index cee1cb7d3..65f6e4c2a 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -503,9 +503,8 @@ void M_StartControlPanel(void)
 			if (restoreMenu == NULL)
 				restoreMenu = &MainDef;
 			currentMenu = M_SpecificMenuRestore(M_InterruptMenuWithChallenges(restoreMenu));
+			restoreMenu = NULL;
 		}
-
-		restoreMenu = NULL;
 	}
 	else
 	{
diff --git a/src/menus/options-profiles-1.c b/src/menus/options-profiles-1.c
index 6295b12c6..1137263f3 100644
--- a/src/menus/options-profiles-1.c
+++ b/src/menus/options-profiles-1.c
@@ -47,7 +47,11 @@ void M_FirstPickProfile(INT32 c)
 		optionsmenu.profile = NULL;	// Make sure to get rid of that, too.
 
 		PR_ApplyProfile(optionsmenu.profilen, 0);
-		M_SetupNextMenu(M_InterruptMenuWithChallenges(&MainDef), false);
+
+		if (restoreMenu == NULL)
+			restoreMenu = &MainDef;
+		M_SetupNextMenu(M_SpecificMenuRestore(M_InterruptMenuWithChallenges(restoreMenu)), false);
+		restoreMenu = NULL;
 
 		// Tell the game this is the last profile we picked.
 		CV_StealthSetValue(&cv_ttlprofilen, optionsmenu.profilen);