diff --git a/src/g_game.c b/src/g_game.c
index 80d027280..ea75a2069 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -313,7 +313,7 @@ boolean thwompsactive; // Thwomps activate on lap 2
 UINT8 lastLowestLap; // Last lowest lap, for activating race lap executors
 SINT8 spbplace; // SPB exists, give the person behind better items
 boolean rainbowstartavailable; // Boolean, keeps track of if the rainbow start was gotten
-tic_t linecrossed; // For Time Attack 
+tic_t linecrossed; // For Time Attack
 boolean inDuel; // Boolean, keeps track of if it is a 1v1
 
 // Client-sided, unsynched variables (NEVER use in anything that needs to be synced with other players)
@@ -1319,6 +1319,10 @@ boolean G_Responder(event_t *ev)
 			|| abs(ev->data3) > JOYAXISRANGE/2))
 		))
 		{
+			if (ev->device > 0)
+			{
+				G_SetDeviceForPlayer(0, ev->device);
+			}
 			M_StartControlPanel();
 			return true;
 		}
diff --git a/src/k_menufunc.c b/src/k_menufunc.c
index fee5cec40..b24394ee3 100644
--- a/src/k_menufunc.c
+++ b/src/k_menufunc.c
@@ -372,8 +372,8 @@ void M_PlayMenuJam(void)
 
 	const boolean trulystarted = M_GameTrulyStarted();
 	const boolean profilemode = (
-		trulystarted 
-		&& optionsmenu.profilemenu 
+		trulystarted
+		&& optionsmenu.profilemenu
 		&& !optionsmenu.resetprofilemenu
 	);
 
@@ -423,7 +423,7 @@ void M_PlayMenuJam(void)
 			"KEYGEN",
 			"LOSERC",
 		};
-		
+
 		if (refMenu != NULL && NotCurrentlyPlaying(overridetotrack[override - 1]))
 		{
 			Music_Remap("menu", overridetotrack[override - 1]);
@@ -682,7 +682,14 @@ void M_ClearMenus(boolean callexitmenufunc)
 #endif //Alam: But not on the Dreamcast's VMUs
 
 	if (gamestate == GS_MENU) // Back to title screen
+	{
+		int i;
+		for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+		{
+			G_SetDeviceForPlayer(i, -1);
+		}
 		D_StartTitle();
+	}
 
 	menutyping.active = false;
 	menumessage.active = false;