diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
index a0aefe1382..c039945425 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
@@ -96,13 +96,17 @@ class LibraryCategoryAdapter(val libraryListener: LibraryListener) :
         val preferences: PreferencesHelper by injectLazy()
         val db: DatabaseHelper by injectLazy()
         if (position == itemCount - 1) return "-"
+        val sorting = if (preferences.hideCategories().getOrDefault())
+            preferences.hideCategories().getOrDefault()
+        else (headerItems.firstOrNull() as? LibraryHeaderItem)?.category?.sortingMode()
+        ?: LibrarySort.DRAG_AND_DROP
         return when (val item: IFlexible<*>? = getItem(position)) {
             is LibraryHeaderItem ->
                 if (preferences.hideCategories().getOrDefault() || item.category.id == 0) null
                 else item.category.name.first().toString() +
                     "\u200B".repeat(max(0, item.category.order))
             is LibraryItem -> {
-                when (preferences.librarySortingMode().getOrDefault()) {
+                when (sorting) {
                     LibrarySort.DRAG_AND_DROP -> {
                         val category = db.getCategoriesForManga(item.manga).executeAsBlocking()
                             .firstOrNull()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderItem.kt
index 464be6155a..8d985b2440 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHeaderItem.kt
@@ -28,6 +28,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.view.gone
 import eu.kanade.tachiyomi.util.view.invisible
 import eu.kanade.tachiyomi.util.view.updateLayoutParams
+import eu.kanade.tachiyomi.util.view.visInvisIf
 import eu.kanade.tachiyomi.util.view.visible
 import kotlinx.android.synthetic.main.library_category_header_item.view.*
 
@@ -142,7 +143,7 @@ class LibraryHeaderItem(
                 else -> {
                     catProgress.gone()
                     checkboxImage.gone()
-                    updateButton.visible()
+                    updateButton.visInvisIf(!(category.isFirst == true && category.isLast == true))
                 }
             }
         }