diff --git a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
index 0a2a058a..a3f58c1f 100644
--- a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
+++ b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java
@@ -72,9 +72,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         this.prefConfig = prefConfig;
         this.deviceVibrator = (Vibrator) activityContext.getSystemService(Context.VIBRATOR_SERVICE);
 
-        // HACK: For now we're hardcoding a 7% deadzone. Some deadzone
-        // is required for controller batching support to work.
-        int deadzonePercentage = 7;
+        int deadzonePercentage = prefConfig.deadzonePercentage;
 
         int[] ids = InputDevice.getDeviceIds();
         for (int id : ids) {
@@ -703,9 +701,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             }
             // SHIELD controllers will use small stick deadzones
             else if (devName.contains("SHIELD") || devName.contains("NVIDIA Controller")) {
-                context.leftStickDeadzoneRadius = 0.07f;
-                context.rightStickDeadzoneRadius = 0.07f;
-
                 // The big Nvidia button on the Shield controllers acts like a Search button. It
                 // summons the Google Assistant on the Shield TV. On my Pixel 4, it seems to do
                 // nothing, so we can hijack it to act like a mode button.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a5bf4987..400b4679 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,6 +168,7 @@
     <string name="title_checkbox_vibrate_fallback">Emulate rumble support with vibration</string>
     <string name="summary_checkbox_vibrate_fallback">Vibrates your device to emulate rumble if your gamepad does not support it</string>
     <string name="title_seekbar_deadzone">Adjust analog stick deadzone</string>
+    <string name="summary_seekbar_deadzone">Note: Some games can enforce a larger deadzone than what Moonlight is configured to use.</string>
     <string name="suffix_seekbar_deadzone">%</string>
     <string name="title_checkbox_xb1_driver">Xbox 360/One USB gamepad driver</string>
     <string name="summary_checkbox_xb1_driver">Enables a built-in USB driver for devices without native Xbox controller support</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5c82d010..c1ea6340 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -52,12 +52,13 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_input_settings"
         android:key="category_input_settings">
-        <!--com.limelight.preferences.SeekBarPreference
+        <com.limelight.preferences.SeekBarPreference
             android:key="seekbar_deadzone"
-            android:defaultValue="15"
-            android:max="50"
+            android:defaultValue="7"
+            android:max="20"
+            android:summary="@string/summary_seekbar_deadzone"
             android:text="@string/suffix_seekbar_deadzone"
-            android:title="@string/title_seekbar_deadzone"/-->
+            android:title="@string/title_seekbar_deadzone"/>
         <CheckBoxPreference
             android:key="checkbox_touchscreen_trackpad"
             android:title="@string/title_checkbox_touchscreen_trackpad"