diff --git a/simulator/README.md b/simulator/README.md
index 6007b0f..b581cff 100644
--- a/simulator/README.md
+++ b/simulator/README.md
@@ -4,10 +4,13 @@ Simulate your badge on the interwebz.
 
 ## Controls
 
-- Escape: open menu
-- WASD/Arrow Keys + Shift: 4 direction pad + click
-- Space: start
-- Enter: select
+- Joystick: Arrow keys/WASD
+- Joystick click: Shift
+- A: Z/K
+- B: X/J
+- Start: Enter/Y
+- Select: Backspace/T
+- Open system menu: Escape
 
 ## Supported Hardware Components
 
diff --git a/simulator/src/ui/app.ts b/simulator/src/ui/app.ts
index 864938c..1267bdf 100644
--- a/simulator/src/ui/app.ts
+++ b/simulator/src/ui/app.ts
@@ -208,16 +208,16 @@ export class App extends LitElement {
 
             let mask = 0;
             switch (event.code) {
-            case "Space":
+            case "Enter": case "KeyY":
                 mask |= constants.CONTROLS_START;
                 break;
-            case "Enter":
+            case "Backspace": case "KeyT":
                 mask |= constants.CONTROLS_SELECT;
                 break;
-            case "KeyQ":
+            case "KeyZ": case "KeyK":
                 mask |= constants.CONTROLS_A;
                 break;
-            case "KeyE":
+            case "KeyX": case "KeyJ":
                 mask |= constants.CONTROLS_B;
                 break;
             case "ShiftLeft": case "ShiftRight":