diff --git a/src/main/java/dev/isxander/controlify/Controlify.java b/src/main/java/dev/isxander/controlify/Controlify.java
index e815739..b7e29d8 100644
--- a/src/main/java/dev/isxander/controlify/Controlify.java
+++ b/src/main/java/dev/isxander/controlify/Controlify.java
@@ -480,11 +480,8 @@ public class Controlify implements ControlifyApi {
         }
 
         this.inGameInputHandler = new InGameInputHandler(controller);
-        if (minecraft.player != null) {
-            this.inGameButtonGuide = new InGameButtonGuide(controller, minecraft.player);
-        }
 
-        ControllerPlayerMovement.updatePlayerInput(minecraft.player);
+        setInputMode(controller.config().mixedInput ? InputMode.MIXED : InputMode.CONTROLLER);
 
         if (!controller.config().deadzonesCalibrated)
             calibrationQueue.add(controller);
@@ -537,6 +534,8 @@ public class Controlify implements ControlifyApi {
         if (this.currentInputMode.isController())
             getCurrentController().ifPresent(Controller::clearState);
 
+        ControllerPlayerMovement.updatePlayerInput(minecraft.player);
+
         ControlifyEvents.INPUT_MODE_CHANGED.invoker().onInputModeChanged(currentInputMode);
 
         return true;
diff --git a/src/main/java/dev/isxander/controlify/ingame/ControllerPlayerMovement.java b/src/main/java/dev/isxander/controlify/ingame/ControllerPlayerMovement.java
index 1141c95..75e8aa3 100644
--- a/src/main/java/dev/isxander/controlify/ingame/ControllerPlayerMovement.java
+++ b/src/main/java/dev/isxander/controlify/ingame/ControllerPlayerMovement.java
@@ -75,7 +75,7 @@ public class ControllerPlayerMovement extends Input {
         if (player == null)
             return;
 
-        if (Controlify.instance().getCurrentController().isPresent()) {
+        if (Controlify.instance().getCurrentController().isPresent() && Controlify.instance().currentInputMode().isController()) {
             player.input = new DualInput(
                     new KeyboardInput(Minecraft.getInstance().options),
                     new ControllerPlayerMovement(Controlify.instance().getCurrentController().get(), player)