diff --git a/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt b/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt
index c5c0196c..a7aa4cc2 100644
--- a/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/enums/GradeSortingMode.kt
@@ -2,9 +2,10 @@ package io.github.wulkanowy.data.enums
 
 enum class GradeSortingMode(val value: String) {
     ALPHABETIC("alphabetic"),
-    DATE("date");
+    DATE("date"),
+    AVERAGE("average");
 
     companion object {
         fun getByValue(value: String) = values().find { it.value == value } ?: ALPHABETIC
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index 746601a6..8cde5d6b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.ui.modules.grade.details
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.enums.GradeExpandMode
-import io.github.wulkanowy.data.enums.GradeSortingMode.ALPHABETIC
-import io.github.wulkanowy.data.enums.GradeSortingMode.DATE
+import io.github.wulkanowy.data.enums.GradeSortingMode
+import io.github.wulkanowy.data.enums.GradeSortingMode.*
 import io.github.wulkanowy.data.repositories.GradeRepository
 import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.SemesterRepository
@@ -204,6 +204,7 @@ class GradeDetailsPresenter @Inject constructor(
                     ALPHABETIC -> gradeSubjects.sortedBy { gradeDetailsWithAverage ->
                         gradeDetailsWithAverage.subject.lowercase()
                     }
+                    AVERAGE -> gradeSubjects.sortedByDescending { it.average }
                 }
             }
             .map { (subject, average, points, _, grades) ->
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index b07570cb..4d5a43d8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -2,6 +2,9 @@ package io.github.wulkanowy.ui.modules.grade.summary
 
 import io.github.wulkanowy.data.*
 import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.data.enums.GradeSortingMode
+import io.github.wulkanowy.data.enums.GradeSortingMode.*
+import io.github.wulkanowy.data.repositories.PreferencesRepository
 import io.github.wulkanowy.data.repositories.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
@@ -14,6 +17,7 @@ import javax.inject.Inject
 class GradeSummaryPresenter @Inject constructor(
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
+    private val preferencesRepository: PreferencesRepository,
     private val averageProvider: GradeAverageProvider,
     private val analytics: AnalyticsHelper
 ) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository) {
@@ -127,7 +131,17 @@ class GradeSummaryPresenter @Inject constructor(
     private fun createGradeSummaryItems(items: List<GradeSubject>): List<GradeSummary> {
         return items
             .filter { !checkEmpty(it) }
-            .sortedBy { it.subject }
+            .let { gradeSubjects ->
+                when (preferencesRepository.gradeSortingMode) {
+                    DATE -> gradeSubjects.sortedByDescending { gradeDetailsWithAverage ->
+                        gradeDetailsWithAverage.grades.maxByOrNull { it.date }?.date
+                    }
+                    ALPHABETIC -> gradeSubjects.sortedBy { gradeDetailsWithAverage ->
+                        gradeDetailsWithAverage.subject.lowercase()
+                    }
+                    AVERAGE -> gradeSubjects.sortedByDescending { it.average }
+                }
+            }
             .map { it.summary.copy(average = it.average) }
     }
 
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index 1d777bdb..312f0b87 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -82,10 +82,12 @@
     <string-array name="grade_sorting_mode_entries">
         <item>Alphabetically</item>
         <item>By date</item>
+        <item>By average</item>
     </string-array>
     <string-array name="grade_sorting_mode_values" translatable="false">
         <item>alphabetic</item>
         <item>date</item>
+        <item>average</item>
     </string-array>
 
     <string-array name="grade_color_scheme_entries">