diff --git a/src/common/config.cpp b/src/common/config.cpp
index e79a52796..fee0b4ed3 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -68,6 +68,7 @@ static bool vkGuestMarkers = false;
 static bool rdocEnable = false;
 static s16 cursorState = HideCursorState::Idle;
 static int cursorHideTimeout = 5; // 5 seconds (default)
+static bool useUnifiedInputConfig = true;
 static bool separateupdatefolder = false;
 static bool compatibilityData = false;
 static bool checkCompatibilityOnStartup = false;
@@ -98,6 +99,14 @@ std::string emulator_language = "en";
 // Language
 u32 m_language = 1; // english
 
+bool GetUseUnifiedInputConfig() {
+    return useUnifiedInputConfig;
+}
+
+void SetUseUnifiedInputConfig(bool use) {
+    useUnifiedInputConfig = use;
+}
+
 std::string getTrophyKey() {
     return trophyKey;
 }
@@ -657,6 +666,7 @@ void load(const std::filesystem::path& path) {
         useSpecialPad = toml::find_or<bool>(input, "useSpecialPad", false);
         specialPadClass = toml::find_or<int>(input, "specialPadClass", 1);
         isMotionControlsEnabled = toml::find_or<bool>(input, "isMotionControlsEnabled", true);
+        useUnifiedInputConfig = toml::find_or<bool>(input, "useUnifiedInputConfig", true);
     }
 
     if (data.contains("GPU")) {
@@ -779,6 +789,7 @@ void save(const std::filesystem::path& path) {
     data["Input"]["useSpecialPad"] = useSpecialPad;
     data["Input"]["specialPadClass"] = specialPadClass;
     data["Input"]["isMotionControlsEnabled"] = isMotionControlsEnabled;
+    data["Input"]["useUnifiedInputConfig"] = useUnifiedInputConfig;
     data["GPU"]["screenWidth"] = screenWidth;
     data["GPU"]["screenHeight"] = screenHeight;
     data["GPU"]["nullGpu"] = isNullGpu;
@@ -969,9 +980,12 @@ touchpad = back
 
 axis_left_x = axis_left_x
 axis_left_y = axis_left_y
-
 axis_right_x = axis_right_x
 axis_right_y = axis_right_y
+
+# Range of deadzones: 1 (almost none) to 127 (max)
+analog_deadzone = leftjoystick, 2
+analog_deadzone = rightjoystick, 2
 )";
 }
 std::filesystem::path GetFoolproofKbmConfigFile(const std::string& game_id) {
diff --git a/src/common/config.h b/src/common/config.h
index f726f840c..77ed69ece 100644
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -43,6 +43,8 @@ std::string getBackButtonBehavior();
 bool getUseSpecialPad();
 int getSpecialPadClass();
 bool getIsMotionControlsEnabled();
+bool GetUseUnifiedInputConfig();
+void SetUseUnifiedInputConfig(bool use);
 
 u32 getScreenWidth();
 u32 getScreenHeight();
diff --git a/src/input/input_handler.cpp b/src/input/input_handler.cpp
index a78a54131..adc7b76eb 100644
--- a/src/input/input_handler.cpp
+++ b/src/input/input_handler.cpp
@@ -198,11 +198,8 @@ InputBinding GetBindingFromString(std::string& line) {
 }
 
 void ParseInputConfig(const std::string game_id = "") {
-    const auto config_file = Config::GetFoolproofKbmConfigFile(game_id);
-
-    if (game_id == "") {
-        return;
-    }
+    std::string config_file = Config::GetUseUnifiedInputConfig() ? "default" : game_id;
+    const auto config_file = Config::GetFoolproofKbmConfigFile(config_file);
 
     // we reset these here so in case the user fucks up or doesn't include some of these,
     // we can fall back to default