diff --git a/src/m_menu.c b/src/m_menu.c
index cc09de247..5245cff3b 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1314,6 +1314,21 @@ boolean M_Responder(event_t *ev)
 			default:
 				break;
 		}
+
+		if (menustack[0])
+		{
+			menuitem_t *item = currentMenu->numitems ? &currentMenu->menuitems[itemOn] : NULL;
+			if (item && item->cvar == &cv_nextmap)
+			{
+				if (ch == gamecontrol[0][gc_fire][0]
+					|| ch == gamecontrol[0][gc_fire][1])
+				{
+					S_StartSound(NULL, sfx_menu1);
+					COM_ImmedExecute("add kartencore 1");
+				}
+			}
+		}
+
 	}
 	else if (menustack[0])
 	{
@@ -1633,19 +1648,6 @@ boolean M_Responder(event_t *ev)
 
 			return true;
 
-		case KEY_SPACE:
-			noFurtherInput = true;
-			if (!item || !item->cvar)
-				return true;
-
-			if (item->cvar == &cv_nextmap)
-			{
-				S_StartSound(NULL, sfx_menu1);
-				COM_ImmedExecute("add kartencore 1");
-				return true;
-			}
-			return true;
-
 		case KEY_BACKSPACE:
 			if (!item || !item->cvar
 			 || item->cvar == &cv_chooseskin