diff --git a/src/m_menu.c b/src/m_menu.c
index 636e804fe1f3690d5e405c6bbe37b3cd42354198..bec3529dac40711c13f8487fa533ce875608867f 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -2088,7 +2088,6 @@ boolean M_Responder(event_t *ev)
 		{
 			case KEY_MOUSE1:
 			case KEY_JOY1:
-			case KEY_JOY1 + 2:
 				ch = KEY_ENTER;
 				break;
 			case KEY_JOY1 + 3:
@@ -2096,6 +2095,9 @@ boolean M_Responder(event_t *ev)
 				break;
 			case KEY_MOUSE1 + 1:
 			case KEY_JOY1 + 1:
+				ch = KEY_ESCAPE;
+				break;
+			case KEY_JOY1 + 2:
 				ch = KEY_BACKSPACE;
 				break;
 			case KEY_HAT1: