diff --git a/res/xml/dark_mode_settings.xml b/res/xml/dark_mode_settings.xml
index 24da9138697..454a1f6cf6f 100644
--- a/res/xml/dark_mode_settings.xml
+++ b/res/xml/dark_mode_settings.xml
@@ -91,4 +91,9 @@
         android:summary="@string/berry_black_theme_summary"
         android:defaultValue="false"
         settings:requiresPackage="org.lineageos.overlay.customization.blacktheme" />
+
+    <SwitchPreferenceCompat
+        android:key="hwui_force_dark"
+        android:title="@string/hwui_force_dark_title"
+        android:summary="@string/hwui_force_dark_summary" />
 </PreferenceScreen>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 220fdce27c9..f875aafe51b 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -617,11 +617,6 @@
             android:entries="@array/show_non_rect_clip_entries"
             android:entryValues="@array/show_non_rect_clip_values" />
 
-        <SwitchPreferenceCompat
-            android:key="hwui_force_dark"
-            android:title="@string/hwui_force_dark_title"
-            android:summary="@string/hwui_force_dark_summary" />
-
         <SwitchPreferenceCompat
             android:key="force_msaa"
             android:title="@string/force_msaa"
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index c4fcd4298d0..7176ff803bf 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -793,7 +793,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new DebugGpuOverdrawPreferenceController(context));
         controllers.add(new DebugNonRectClipOperationsPreferenceController(context));
         controllers.add(new GameDefaultFrameRatePreferenceController(context));
-        controllers.add(new ForceDarkPreferenceController(context));
         controllers.add(new ForceMSAAPreferenceController(context));
         controllers.add(new HardwareOverlaysPreferenceController(context));
         controllers.add(new SimulateColorSpacePreferenceController(context));
diff --git a/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java b/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
index 17d32a536f6..b6064d792ac 100644
--- a/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
+++ b/src/com/android/settings/display/darkmode/DarkModeSettingsFragment.java
@@ -75,6 +75,7 @@ public class DarkModeSettingsFragment extends DashboardFragment {
                 DARK_THEME_END_TIME, this);
         controllers.add(mCustomStartController);
         controllers.add(mCustomEndController);
+        controllers.add(new ForceDarkPreferenceController(context));
         return controllers;
     }
 
diff --git a/src/com/android/settings/development/ForceDarkPreferenceController.java b/src/com/android/settings/display/darkmode/ForceDarkPreferenceController.java
similarity index 98%
rename from src/com/android/settings/development/ForceDarkPreferenceController.java
rename to src/com/android/settings/display/darkmode/ForceDarkPreferenceController.java
index c81c16f3263..e5e4817c766 100644
--- a/src/com/android/settings/development/ForceDarkPreferenceController.java
+++ b/src/com/android/settings/display/darkmode/ForceDarkPreferenceController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.development;
+package com.android.settings.display.darkmode;
 
 import android.content.Context;
 import android.os.SystemProperties;