diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
index 7651ccd3..dd1edc8d 100644
--- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
@@ -750,7 +750,7 @@ class AnilistQueries {
             }
         }
         return if (!genres.isNullOrEmpty() && tags != null) {
-            Anilist.genres = genres
+            Anilist.genres = genres?.sortedBy { it }?.toMutableList() as ArrayList<String>
             Anilist.tags = tags
             true
         } else false
diff --git a/app/src/main/java/ani/dantotsu/media/GenreActivity.kt b/app/src/main/java/ani/dantotsu/media/GenreActivity.kt
index 0c49ec11..5d89e42f 100644
--- a/app/src/main/java/ani/dantotsu/media/GenreActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/GenreActivity.kt
@@ -67,11 +67,12 @@ class GenreActivity : AppCompatActivity() {
 
     private fun loadLocalGenres(): ArrayList<String>? {
         val genres = PrefManager.getVal<Set<String>>(PrefName.GenresList)
-            .toMutableList() as ArrayList<String>?
-        return if (genres.isNullOrEmpty()) {
+            .toMutableList()
+        return if (genres.isEmpty()) {
             null
         } else {
-            genres
+            //sort alphabetically
+            genres.sort().let { genres as ArrayList<String> }
         }
     }
 }
\ No newline at end of file