diff --git a/app/src/main/java/eu/kanade/presentation/library/LibraryState.kt b/app/src/main/java/eu/kanade/presentation/library/LibraryState.kt
index 94d06e393..4fee5adc7 100644
--- a/app/src/main/java/eu/kanade/presentation/library/LibraryState.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/LibraryState.kt
@@ -23,6 +23,7 @@ interface LibraryState {
     var hasActiveFilters: Boolean
 
     // SY -->
+    val ogCategories: List<Category>
     val showSyncExh: Boolean
     val showCleanTitles: Boolean
     val showAddToMangadex: Boolean
@@ -42,6 +43,8 @@ class LibraryStateImpl : LibraryState {
     override var hasActiveFilters: Boolean by mutableStateOf(false)
 
     // SY -->
+    override var ogCategories: List<Category> by mutableStateOf(emptyList())
+
     override var showSyncExh: Boolean by mutableStateOf(true)
     override val showCleanTitles: Boolean by derivedStateOf {
         selection.any {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
index 5dbaa3073..440dd0763 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@@ -183,7 +183,7 @@ class LibraryController(
     }
 
     fun showSettingsSheet() {
-        if (presenter.categories.isNotEmpty()) {
+        if (presenter.categories.isNotEmpty() /* SY --> */ && presenter.groupType == LibraryGroup.BY_DEFAULT /* SY <-- */) {
             presenter.categories[presenter.activeCategory].let { category ->
                 settingsSheet?.show(category.toDbCategory())
             }
@@ -248,7 +248,7 @@ class LibraryController(
             val mangas = presenter.selection.toList()
 
             // Hide the default category because it has a different behavior than the ones from db.
-            val categories = presenter.categories.filter { it.id != 0L }
+            val categories = presenter.ogCategories.filter { it.id != 0L } // SY <--
 
             // Get indexes of the common categories to preselect.
             val common = presenter.getCommonCategories(mangas.mapNotNull { it.toDomainManga() })
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index e74be5887..29db54c17 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -177,7 +177,7 @@ class LibraryPresenter(
     // SY -->
     val favoritesSync = FavoritesSyncHelper(context)
 
-    var groupType = preferences.groupLibraryBy().get()
+    val groupType by preferences.groupLibraryBy().asState()
 
     private val loggedServices by lazy { trackManager.services.filter { it.isLogged } }
 
@@ -248,6 +248,9 @@ class LibraryPresenter(
                     .observeOn(AndroidSchedulers.mainThread())
                     .asFlow()
                     .collectLatest {
+                        // SY -->
+                        state.categories = it.categories
+                        // SY <--
                         state.isLoading = false
                         loadedManga = it.mangaMap
                     }
@@ -588,28 +591,32 @@ class LibraryPresenter(
                 }
             }
 
-            state.categories = categories
+            // SY -->
+            state.ogCategories = categories
+            // SY <--
             Library(categories, libraryManga)
         }.asObservable()
     }
 
     // SY -->
     private fun applyGrouping(map: LibraryMap, categories: List<Category>): Pair<LibraryMap, List<Category>> {
-        groupType = preferences.groupLibraryBy().get()
+        val groupType = preferences.groupLibraryBy().get()
         var editedCategories = categories
-        val items = if (groupType == LibraryGroup.BY_DEFAULT) {
-            map
-        } else if (groupType == LibraryGroup.UNGROUPED) {
-            editedCategories = listOf(Category(0, "All", 0, 0))
-            mapOf(
-                0L to map.values.flatten().distinctBy { it.manga.id },
-            )
-        } else {
-            val (items, customCategories) = getGroupedMangaItems(
-                map.values.flatten().distinctBy { it.manga.id },
-            )
-            editedCategories = customCategories
-            items
+        val items = when (groupType) {
+            LibraryGroup.BY_DEFAULT -> map
+            LibraryGroup.UNGROUPED -> {
+                editedCategories = listOf(Category(0, "All", 0, 0))
+                mapOf(
+                    0L to map.values.flatten().distinctBy { it.manga.id },
+                )
+            }
+            else -> {
+                val (items, customCategories) = getGroupedMangaItems(
+                    map.values.flatten().distinctBy { it.manga.id },
+                )
+                editedCategories = customCategories
+                items
+            }
         }
 
         return items to editedCategories
@@ -929,7 +936,7 @@ class LibraryPresenter(
         }
         val unfiltered = loadedManga[categoryId] ?: emptyList()
 
-        return produceState(initialValue = unfiltered, searchQuery) {
+        return produceState(initialValue = unfiltered, unfiltered, searchQuery) {
             val query = searchQuery
             value = withIOContext {
                 if (unfiltered.isNotEmpty() && !query.isNullOrBlank()) {
@@ -1072,7 +1079,9 @@ class LibraryPresenter(
     fun getDisplayMode(index: Int): androidx.compose.runtime.State<DisplayModeSetting> {
         val category = categories[index]
         return derivedStateOf {
-            if (isPerCategory.not() || category.id == 0L) {
+            // SY -->
+            if (groupType != LibraryGroup.BY_DEFAULT || isPerCategory.not() || (category.id == 0L && groupType == LibraryGroup.BY_DEFAULT)) {
+                // SY <--
                 currentDisplayMode
             } else {
                 DisplayModeSetting.fromFlag(category.displayMode)