diff --git a/RELEASE.md b/RELEASE.md
index 6337ab5..2c1ffa1 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -10,6 +10,7 @@
 ## 0.6.x
 
 - SteamController: Add initial `DS4` support (with Gyro, Accel, Trackpads and Haptics)
+- SteamController: Move `KeepX360AlwaysConnected` to `Settings`
 - PowerControl: Install custom resolutions (EDID) (experimental feature)
 - SteamController: Add `X360: No Touchpads` profile
 - All: Show `Missing RTSS` button to install RTSS
diff --git a/SteamController/Controller.cs b/SteamController/Controller.cs
index ed8025b..fd7ae0c 100644
--- a/SteamController/Controller.cs
+++ b/SteamController/Controller.cs
@@ -419,7 +419,9 @@ namespace SteamController
                     DS4Haptic = ProfilesSettings.HapticSettings.DS4,
 #endif
                     Application = Settings.Default,
+#if DEBUG
                     DEBUG = SettingsDebug.Default
+#endif
                 }
             };
 
diff --git a/SteamController/Devices/Xbox360Controller.cs b/SteamController/Devices/Xbox360Controller.cs
index 8e1973d..a097315 100644
--- a/SteamController/Devices/Xbox360Controller.cs
+++ b/SteamController/Devices/Xbox360Controller.cs
@@ -87,7 +87,7 @@ namespace SteamController.Devices
             lastPressed = pressed;
             pressed = new Dictionary<Xbox360Button, DateTime>();
             submitReport = false;
-            Connected = SettingsDebug.Default.KeepX360AlwaysConnected;
+            Connected = Settings.Default.KeepX360AlwaysConnected;
         }
 
         private void SetConnected(bool wantsConnected)
@@ -144,7 +144,7 @@ namespace SteamController.Devices
 
         internal void Beep()
         {
-            if (SettingsDebug.Default.KeepX360AlwaysConnected)
+            if (Settings.Default.KeepX360AlwaysConnected)
                 return;
             if (device is null)
                 return;
diff --git a/SteamController/Settings.cs b/SteamController/Settings.cs
index 865b3c5..9bbe3a0 100644
--- a/SteamController/Settings.cs
+++ b/SteamController/Settings.cs
@@ -20,6 +20,13 @@ namespace SteamController
             set { Set("EnableSteamDetection", value); }
         }
 
+        [Description("Keep X360 controller connected always - it is strongly advised to disable this option. Might be required by some games that do not like disonnecting controller. Will disable beep notifications.")]
+        public bool KeepX360AlwaysConnected
+        {
+            get { return Get<bool>("KeepX360AlwaysConnected", false); }
+            set { Set("KeepX360AlwaysConnected", value); }
+        }
+
         [Description("If current foreground process uses overlay, treat it as a game.")]
         public bool DetectRTSSForeground
         {
diff --git a/SteamController/SettingsDebug.cs b/SteamController/SettingsDebug.cs
index aa22a7b..bfc380e 100644
--- a/SteamController/SettingsDebug.cs
+++ b/SteamController/SettingsDebug.cs
@@ -13,13 +13,6 @@ namespace SteamController
         {
         }
 
-        [Description("Keep X360 controller connected always - it is strongly advised to disable this option. Might be required by some games that do not like disonnecting controller. Will disable beep notifications.")]
-        public bool KeepX360AlwaysConnected
-        {
-            get { return Get<bool>("KeepX360AlwaysConnected", false); }
-            set { Set("KeepX360AlwaysConnected", value); }
-        }
-
         [Description("Use Lizard Buttons instead of emulated. This option is only for testing purposes.")]
         public bool LizardButtons { get; set; } = false;