diff --git a/README.md b/README.md
index eef3d2693..8934ae0cf 100644
--- a/README.md
+++ b/README.md
@@ -232,9 +232,9 @@ Default controller mappings (A/B/X/Y as in Nintendo layout, so the rightmost but
 - L1: character sheet
 - R2: use mana potion from belt
 - L2: use health item from belt
-- Left analog click: quest log
+- Left analog click: toggle automap
 - Right analog click: left mouse click
-- Select: automap
+- Select: quest log
 - Start: game Menu, skip intro
 
 For now, they can be re-mapped by changing `SourceX/controls` or by setting the `SDL_GAMECONTROLLERCONFIG` environment
diff --git a/SourceX/controls/game_controls.cpp b/SourceX/controls/game_controls.cpp
index 3e1573b92..47901f6ce 100644
--- a/SourceX/controls/game_controls.cpp
+++ b/SourceX/controls/game_controls.cpp
@@ -23,11 +23,11 @@ DWORD translate_controller_button_to_key(ControllerButton controller_button)
 	case ControllerButton::BUTTON_Y: // Top button
 		return DVL_VK_RETURN;
 	case ControllerButton::BUTTON_LEFTSTICK:
-		return 'Q'; // Quest log
+		return DVL_VK_TAB; // Map
 	case ControllerButton::BUTTON_START:
 		return DVL_VK_ESCAPE;
 	case ControllerButton::BUTTON_BACK:
-		return DVL_VK_TAB; // Map
+		return 'Q'; // Quest log
 	case ControllerButton::BUTTON_DPAD_LEFT:
 		return DVL_VK_LEFT;
 	case ControllerButton::BUTTON_DPAD_RIGHT: