diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 425748b28..e4425a1a0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,7 +27,7 @@ android {
         applicationId = "eu.kanade.tachiyomi.sy"
         minSdk = AndroidConfig.minSdk
         targetSdk = AndroidConfig.targetSdk
-        versionCode = 36
+        versionCode = 37
         versionName = "1.8.4"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt
index f8bb3c560..31ca60d70 100644
--- a/app/src/main/java/exh/EXHMigrations.kt
+++ b/app/src/main/java/exh/EXHMigrations.kt
@@ -412,7 +412,7 @@ object EXHMigrations {
                         preferences.navigationModeWebtoon().set(5)
                     }
                 }
-                if (oldVersion under 36) {
+                if (oldVersion under 37) {
                     // Handle renamed enum values
                     @Suppress("DEPRECATION")
                     val newSortingMode = when (val oldSortingMode = preferences.librarySortingMode().get()) {
@@ -426,7 +426,7 @@ object EXHMigrations {
                     runBlocking {
                         handler.await(true) {
                             categoriesQueries.getCategories(categoryMapper).executeAsList()
-                                .filter { SortModeSetting.fromFlag(it.flags) == SortModeSetting.DRAG_AND_DROP }
+                                .filter { SortModeSetting.fromFlag(it.flags and SortModeSetting.MASK) == SortModeSetting.DRAG_AND_DROP }
                                 .forEach {
                                     categoriesQueries.update(
                                         categoryId = it.id,