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 841c5359e0..762d0275a0 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
@@ -840,7 +840,9 @@ class LibraryController(
         super.onChangeStarted(handler, type)
         if (type.isEnter) {
             binding.filterBottomSheet.filterBottomSheet.isVisible = true
-            presenter.getLibrary()
+            if (type == ControllerChangeType.POP_ENTER) {
+                presenter.getLibrary()
+            }
             DownloadService.callListeners()
             LibraryUpdateService.setListener(this)
             binding.recyclerCover.isClickable = false
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 a841374be9..524ca34d38 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -93,8 +93,8 @@ class LibraryPresenter(
 
     override fun onCreate() {
         super.onCreate()
-        libraryItems = lastLibraryItems ?: return
-        categories = lastCategories ?: return
+        lastLibraryItems?.let { libraryItems = it }
+        lastCategories?.let { categories = it }
         lastCategories = null
         lastLibraryItems = null
         getLibrary()