diff --git a/app/src/main/res/xml/prefs_screen_advanced.xml b/app/src/main/res/xml/prefs_screen_advanced.xml
index 16e014ab4..98e99c5f5 100644
--- a/app/src/main/res/xml/prefs_screen_advanced.xml
+++ b/app/src/main/res/xml/prefs_screen_advanced.xml
@@ -33,6 +33,18 @@
         latin:maxValue="@integer/config_max_longpress_timeout"
         latin:stepValue="@integer/config_longpress_timeout_step" />
 
+    <SwitchPreferenceCompat
+        android:key="pref_space_trackpad"
+        android:title="@string/space_trackpad"
+        android:summary="@string/space_trackpad_summary"
+        android:defaultValue="true" />
+
+    <SwitchPreferenceCompat
+        android:key="pref_delete_swipe"
+        android:title="@string/delete_swipe"
+        android:summary="@string/delete_swipe_summary"
+        android:defaultValue="true" />
+
     <SwitchPreferenceCompat
         android:key="prefs_long_press_keyboard_to_change_lang"
         android:title="@string/prefs_long_press_keyboard_to_change_lang"
@@ -64,30 +76,12 @@
     <PreferenceCategory
         android:title="@string/settings_category_experimental">
 
-        <SwitchPreferenceCompat
-            android:key="pref_space_trackpad"
-            android:title="@string/space_trackpad"
-            android:summary="@string/space_trackpad_summary"
-            android:defaultValue="true" />
-
         <SwitchPreferenceCompat
             android:key="pref_space_language_slide"
             android:title="@string/space_language_slide"
             android:summary="@string/space_language_slide_summary"
             android:defaultValue="false" />
 
-        <SwitchPreferenceCompat
-            android:key="pref_delete_swipe"
-            android:title="@string/delete_swipe"
-            android:summary="@string/delete_swipe_summary"
-            android:defaultValue="true" />
-
-        <SwitchPreferenceCompat
-            android:key="pref_autospace_after_punctuation"
-            android:title="@string/autospace_after_punctuation"
-            android:summary="@string/autospace_after_punctuation_summary"
-            android:defaultValue="false" />
-
         <SwitchPreferenceCompat
             android:key="pref_show_all_more_keys"
             android:title="@string/show_all_more_keys_title"
diff --git a/app/src/main/res/xml/prefs_screen_correction.xml b/app/src/main/res/xml/prefs_screen_correction.xml
index ab74ec9e5..3eb12704b 100644
--- a/app/src/main/res/xml/prefs_screen_correction.xml
+++ b/app/src/main/res/xml/prefs_screen_correction.xml
@@ -63,6 +63,12 @@
             android:defaultValue="true"
             android:persistent="true" />
 
+        <SwitchPreferenceCompat
+            android:key="pref_autospace_after_punctuation"
+            android:title="@string/autospace_after_punctuation"
+            android:summary="@string/autospace_after_punctuation_summary"
+            android:defaultValue="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory