diff --git a/Source/controls/game_controls.cpp b/Source/controls/game_controls.cpp
index ada47ec68..ac5251f97 100644
--- a/Source/controls/game_controls.cpp
+++ b/Source/controls/game_controls.cpp
@@ -29,12 +29,12 @@ SDL_Keycode TranslateControllerButtonToGameMenuKey(ControllerButton controllerBu
 {
 	switch (TranslateTo(GamepadType, controllerButton)) {
 	case ControllerButton_BUTTON_A:
+	case ControllerButton_BUTTON_Y:
+		return SDLK_RETURN;
+	case ControllerButton_BUTTON_B:
 	case ControllerButton_BUTTON_BACK:
 	case ControllerButton_BUTTON_START:
 		return SDLK_ESCAPE;
-	case ControllerButton_BUTTON_B:
-	case ControllerButton_BUTTON_Y:
-		return SDLK_RETURN;
 	case ControllerButton_BUTTON_LEFTSTICK:
 		return SDLK_TAB; // Map
 	default:
@@ -46,11 +46,11 @@ SDL_Keycode TranslateControllerButtonToMenuKey(ControllerButton controllerButton
 {
 	switch (TranslateTo(GamepadType, controllerButton)) {
 	case ControllerButton_BUTTON_A:
+		return SDLK_SPACE;
+	case ControllerButton_BUTTON_B:
 	case ControllerButton_BUTTON_BACK:
 	case ControllerButton_BUTTON_START:
 		return SDLK_ESCAPE;
-	case ControllerButton_BUTTON_B:
-		return SDLK_SPACE;
 	case ControllerButton_BUTTON_Y:
 		return SDLK_RETURN;
 	case ControllerButton_BUTTON_LEFTSTICK:
@@ -72,10 +72,10 @@ SDL_Keycode TranslateControllerButtonToQuestLogKey(ControllerButton controllerBu
 {
 	switch (TranslateTo(GamepadType, controllerButton)) {
 	case ControllerButton_BUTTON_A:
-		return SDLK_SPACE;
-	case ControllerButton_BUTTON_B:
 	case ControllerButton_BUTTON_Y:
 		return SDLK_RETURN;
+	case ControllerButton_BUTTON_B:
+		return SDLK_SPACE;
 	case ControllerButton_BUTTON_LEFTSTICK:
 		return SDLK_TAB; // Map
 	default: