diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index d1082f4ad1f..b0487031c83 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -147,6 +147,12 @@
             settings:keywords="@string/keywords_enhance_4g_lte"
             settings:controller="com.android.settings.network.telephony.Enhanced4gAdvancedCallingPreferenceController"/>
 
+        <!-- Settings search is handled by NrAdvancedCallingSearchItem. -->
+        <com.android.settings.spa.preference.ComposePreference
+            android:key="nr_advanced_calling"
+            settings:searchable="false"
+            settings:controller="com.android.settings.network.telephony.NrAdvancedCallingPreferenceController"/>
+
         <SwitchPreferenceCompat
             android:key="contact_discovery_opt_in"
             android:title="@string/contact_discovery_opt_in_title"
@@ -314,12 +320,6 @@
             android:summary="@string/require_cellular_encryption_summary"
             settings:controller=
                 "com.android.settings.network.telephony.NullAlgorithmsPreferenceController"/>
-
-        <!-- Settings search is handled by NrAdvancedCallingSearchItem. -->
-        <com.android.settings.spa.preference.ComposePreference
-            android:key="nr_advanced_calling"
-            settings:searchable="false"
-            settings:controller="com.android.settings.network.telephony.NrAdvancedCallingPreferenceController"/>
     </PreferenceCategory>
 
     <Preference