diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts
index 5f561535855..43eb8e1a1a3 100644
--- a/src/inputs-controller.ts
+++ b/src/inputs-controller.ts
@@ -35,6 +35,8 @@ export class InputsController {
     private interactions: Map<Button, Map<string, boolean>> = new Map();
     private time: Time;
     private player: Map<String, GamepadMapping> = new Map();
+    private analogStickThreshold = 0.5;
+    private axisTime = 0;
 
     constructor(scene: Phaser.Scene) {
         this.scene = scene;
@@ -88,6 +90,7 @@ export class InputsController {
     }
 
     update(): void {
+        this.checkAxis(); // for analog support
         // reversed to let the cancel button have a kinda priority on the action button
         for (const b of Utils.getEnumValues(Button).reverse()) {
             if (!this.interactions.hasOwnProperty(b)) continue;
@@ -101,6 +104,44 @@ export class InputsController {
         }
     }
 
+    checkAxis(): void {
+        if (!this.scene.gamepadSupport || !this.gamepads?.length) return;
+        const gamepad = this.gamepads[0];
+
+		const leftStickX = gamepad.axes[0].getValue();
+		const leftStickY = gamepad.axes[1].getValue();
+        if (!leftStickX || !leftStickY) return;
+
+        let input = null;
+
+        if (Math.abs(leftStickX) > Math.abs(leftStickY)) {
+            if (leftStickX < -this.analogStickThreshold) {
+                input = Button.LEFT;
+            } else if (leftStickX > this.analogStickThreshold) {
+                input = Button.RIGHT;
+            }
+        } else if(Math.abs(leftStickY) > Math.abs(leftStickX)) {
+            if (leftStickY < -this.analogStickThreshold) {
+                input = Button.UP;
+            } else if (leftStickY > this.analogStickThreshold) {
+                input = Button.DOWN;
+            }
+        }
+
+        if (this.time.now - this.axisTime < repeatInputDelayMillis) return;
+        if (input !== null) {
+            this.events.emit('input_down', {
+                controller_type: 'keyboard',
+                button: input,
+            });
+            this.events.emit('input_up', {
+                controller_type: 'keyboard',
+                button: input,
+            });
+            this.axisTime = this.time.now;
+        }
+    }
+
     setupGamepad(thisGamepad: Phaser.Input.Gamepad.Gamepad): void {
         let gamepadID = thisGamepad.id.toLowerCase();
         const mappedPad = this.mapGamepad(gamepadID);
@@ -251,16 +292,26 @@ export class InputsController {
         }
     }
 
-    setLastProcessedMovementTime(button: Button): void {
+    setLastProcessedMovementTime(button: Button, axis:boolean = false): void {
         if (!this.interactions.hasOwnProperty(button)) return;
-        this.setButtonLock(button);
+        if (axis) {
+            this.buttonLock = button;
+            this.buttonLock2 = null;
+        } else {
+            this.setButtonLock(button);
+        }
         this.interactions[button].pressTime = this.time.now;
         this.interactions[button].isPressed = true;
     }
 
-    delLastProcessedMovementTime(button: Button): void {
+    delLastProcessedMovementTime(button: Button, axis:boolean = false): void {
         if (!this.interactions.hasOwnProperty(button)) return;
-        this.releaseButtonLock(button);
+        if (axis) {
+            this.buttonLock = null;
+            this.buttonLock2 = null;
+        } else {
+            this.releaseButtonLock(button);
+        }
         this.interactions[button].pressTime = null;
         this.interactions[button].isPressed = false;
     }