diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b662d4ad5..d8674705a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -668,6 +668,7 @@
     <string name="pref_attendance_appearance_view">Attendance</string>
     <string name="pref_timetable_appearance_view">Timetable</string>
     <string name="pref_grades_advanced_header">Grades</string>
+    <string name="pref_counted_average_advanced_header">Calculated average</string>
     <string name="pref_messages_advanced_header">Messages</string>
 
     <string name="pref_appearance_category">Appearance &amp; Behavior</string>
diff --git a/app/src/main/res/xml/scheme_preferences_advanced.xml b/app/src/main/res/xml/scheme_preferences_advanced.xml
index 461037871..95f6f383a 100644
--- a/app/src/main/res/xml/scheme_preferences_advanced.xml
+++ b/app/src/main/res/xml/scheme_preferences_advanced.xml
@@ -19,18 +19,16 @@
             app:key="@string/pref_key_grade_modifier_minus"
             app:title="@string/pref_other_grade_modifier_minus"
             app:useSimpleSummaryProvider="true" />
+    </PreferenceCategory>
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:title="@string/pref_counted_average_advanced_header">
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_grade_average_force_calc"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_grade_average_force_calc"
             app:singleLineTitle="false"
             app:title="@string/pref_view_grade_average_force_calc" />
-        <SwitchPreferenceCompat
-            app:defaultValue="@bool/pref_default_optional_arithmetic_average"
-            app:iconSpaceReserved="false"
-            app:key="@string/pref_key_optional_arithmetic_average"
-            app:singleLineTitle="false"
-            app:title="@string/pref_other_optional_arithmetic_average" />
         <ListPreference
             app:defaultValue="@string/pref_default_grade_average_mode"
             app:entries="@array/grade_average_mode_entries"
@@ -39,6 +37,12 @@
             app:key="@string/pref_key_grade_average_mode"
             app:title="@string/pref_view_grade_average_mode"
             app:useSimpleSummaryProvider="true" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_optional_arithmetic_average"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_optional_arithmetic_average"
+            app:singleLineTitle="false"
+            app:title="@string/pref_other_optional_arithmetic_average" />
     </PreferenceCategory>
     <PreferenceCategory
         app:iconSpaceReserved="false"