diff --git a/src/g_game.c b/src/g_game.c
index 9408bca48..16a1839d3 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1513,7 +1513,7 @@ boolean G_Responder(event_t *ev)
 	if (gameaction == ga_nothing && !demo.quitafterplaying &&
 		((demo.playback && !modeattacking && !demo.title && !multiplayer) || gamestate == GS_TITLESCREEN))
 	{
-		if (ev->type == ev_keydown && ev->data1 != 301 && !(gamestate == GS_TITLESCREEN && finalecount < TICRATE))
+		if (ev->type == ev_keydown)
 		{
 			M_StartControlPanel();
 			return true;
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index ba2d02ce5..87f87bad3 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -414,8 +414,6 @@ void M_StartControlPanel(void)
 			optionsmenu.profilen = cv_ttlprofilen.value;
 
 			// options don't need initializing here.
-			PR_ApplyProfile(0, 0); // apply guest profile to player 0 by default.
-			// this is to garantee that the controls aren't fucked up.
 
 			// make sure we don't overstep that.
 			if (optionsmenu.profilen > PR_GetNumProfiles())
diff --git a/src/menus/options-profiles-1.c b/src/menus/options-profiles-1.c
index bc0fc280c..6295b12c6 100644
--- a/src/menus/options-profiles-1.c
+++ b/src/menus/options-profiles-1.c
@@ -33,6 +33,7 @@ void M_ProfileSelectInit(INT32 choice)
 {
 	(void)choice;
 	optionsmenu.profilemenu = true;
+	optionsmenu.profilen = cv_currprofile.value;
 
 	M_SetupNextMenu(&OPTIONS_ProfilesDef, false);
 }