diff --git a/src/mods/VR.cpp b/src/mods/VR.cpp
index 5cd27999..6cbf3d22 100644
--- a/src/mods/VR.cpp
+++ b/src/mods/VR.cpp
@@ -697,6 +697,7 @@ void VR::on_xinput_get_state(uint32_t* retval, uint32_t user_index, XINPUT_STATE
     if (*retval == ERROR_SUCCESS) {
         // Once here for normal gamepads, and once for the spoofed gamepad at the end
         update_imgui_state_from_xinput_state(*state, false);
+        gamepad_snapturn(*state);
     }
 
     const auto now = std::chrono::steady_clock::now();
@@ -3125,6 +3126,33 @@ void VR::recenter_view() {
     set_rotation_offset(new_rotation_offset);
 }
 
+void VR::gamepad_snapturn(XINPUT_STATE& state) {
+    if (!m_snapturn->value()) {
+        return;
+    }
+
+    if (!is_hmd_active()) {
+        return;
+    }
+
+    const auto stick_axis = (float)state.Gamepad.sThumbRX / (float)std::numeric_limits<SHORT>::max();
+
+    if (!m_was_snapturn_run_on_input) {
+        if (glm::abs(stick_axis) > m_snapturn_joystick_deadzone->value()) {
+            m_snapturn_left = stick_axis < 0.0f;
+            m_snapturn_on_frame = true;
+            m_was_snapturn_run_on_input = true;
+            state.Gamepad.sThumbRX = 0;
+        }
+    } else {
+        if (glm::abs(stick_axis) < m_snapturn_joystick_deadzone->value()) {
+            m_was_snapturn_run_on_input = false;
+        } else {
+            state.Gamepad.sThumbRX = 0;
+        }
+    }
+}
+
 void VR::process_snapturn() {
     if (!m_snapturn_on_frame) {
         return;
diff --git a/src/mods/VR.hpp b/src/mods/VR.hpp
index c723f8fe..18d467cd 100644
--- a/src/mods/VR.hpp
+++ b/src/mods/VR.hpp
@@ -787,6 +787,7 @@ class VR : public Mod {
     const ModToggle::Ptr m_swap_controllers{ ModToggle::create(generate_name("SwapControllerInputs"), false) };
 
     // Snap turn settings and globals
+    void gamepad_snapturn(XINPUT_STATE& state);
     void process_snapturn();
     
     const ModToggle::Ptr m_snapturn{ ModToggle::create(generate_name("SnapTurn"), false) };