diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 678b1e2d2f7..3a4bb848acf 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -90,21 +90,6 @@
 
     </PreferenceCategory>
 
-    <!-- An optional preference category for feedback. Only displayed up if enabled via flags and config. -->
-    <PreferenceCategory
-        android:key="time_feedback_preference_category"
-        android:title="@string/time_feedback_category_title"
-        settings:controller="com.android.settings.datetime.TimeFeedbackPreferenceCategoryController"
-        settings:keywords="@string/keywords_time_feedback_category">
-
-        <Preference
-            android:key="time_feedback"
-            android:title="@string/time_feedback_title"
-            settings:controller="com.android.settings.datetime.TimeFeedbackPreferenceController"
-            settings:keywords="@string/keywords_time_feedback" />
-
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="time_format_preference_category"
         android:title="@string/time_format_category_title"
@@ -116,4 +101,18 @@
             settings:controller="com.android.settings.datetime.TimeFormatPreferenceController" />
     </PreferenceCategory>
 
+    <!-- An optional preference category for feedback. Only displayed up if enabled via flags and config. Always put time feedback at the end. -->
+    <PreferenceCategory
+        android:key="time_feedback_preference_category"
+        android:title="@string/time_feedback_category_title"
+        settings:controller="com.android.settings.datetime.TimeFeedbackPreferenceCategoryController"
+        settings:keywords="@string/keywords_time_feedback_category">
+
+        <Preference
+            android:key="time_feedback"
+            android:title="@string/time_feedback_title"
+            settings:controller="com.android.settings.datetime.TimeFeedbackPreferenceController"
+            settings:keywords="@string/keywords_time_feedback" />
+    </PreferenceCategory>
+
 </PreferenceScreen>