diff --git a/quakespasm/Quake/gl_screen.c b/quakespasm/Quake/gl_screen.c
index 34d9a949..c380a57d 100644
--- a/quakespasm/Quake/gl_screen.c
+++ b/quakespasm/Quake/gl_screen.c
@@ -924,7 +924,7 @@ int SCR_ModalMessage (const char *text, float timeout) //johnfitz -- timeout
 	} while (lastchar != 'y' && lastchar != 'Y' &&
 		 lastchar != 'n' && lastchar != 'N' &&
 		 lastkey != K_ESCAPE &&
-		 lastkey != K_X360_B && lastkey != K_X360_A &&
+		 lastkey != K_ENTER && //ericw -- K_ENTER used by x360 controller
 		 time2 <= time1);
 	Key_EndInputGrab ();
 
@@ -935,7 +935,7 @@ int SCR_ModalMessage (const char *text, float timeout) //johnfitz -- timeout
 		return false;
 	//johnfitz
 
-	return (lastchar == 'y' || lastchar == 'Y' || lastkey == K_X360_A);
+	return (lastchar == 'y' || lastchar == 'Y' || lastkey == K_ENTER);
 }
 
 
diff --git a/quakespasm/Quake/keys.c b/quakespasm/Quake/keys.c
index 0aee135e..bfc91fad 100644
--- a/quakespasm/Quake/keys.c
+++ b/quakespasm/Quake/keys.c
@@ -996,8 +996,7 @@ void Key_Event (int key, qboolean down)
 	{
 		int emukey = IN_EmulatedKeyForControllerKey(key);
 		
-		if (key_dest == key_menu
-			&& !key_inputgrab.active)
+		if (key_dest == key_game)
 		{
 			key = emukey;
 		}