diff --git a/apps/readest-app/src/app/library/components/Bookshelf.tsx b/apps/readest-app/src/app/library/components/Bookshelf.tsx
index a2bcc761..b5be2ffb 100644
--- a/apps/readest-app/src/app/library/components/Bookshelf.tsx
+++ b/apps/readest-app/src/app/library/components/Bookshelf.tsx
@@ -74,23 +74,6 @@ const Bookshelf: React.FC<BookshelfProps> = ({
 
   const currentBookshelfItems = navBooksGroup ? navBooksGroup.books : allBookshelfItems;
 
-  useEffect(() => {
-    if (isSelectMode) {
-      setShowSelectModeActions(true);
-      if (isSelectAll) {
-        setSelectedBooks(
-          currentBookshelfItems.map((item) => ('hash' in item ? item.hash : item.id)),
-        );
-      } else if (isSelectNone) {
-        setSelectedBooks([]);
-      }
-    } else {
-      setSelectedBooks([]);
-      setShowSelectModeActions(false);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isSelectMode, isSelectAll, isSelectNone]);
-
   useEffect(() => {
     if (isImportingBook.current) return;
     isImportingBook.current = true;
@@ -267,6 +250,23 @@ const Bookshelf: React.FC<BookshelfProps> = ({
       }
     });
 
+  useEffect(() => {
+    if (isSelectMode) {
+      setShowSelectModeActions(true);
+      if (isSelectAll) {
+        setSelectedBooks(
+          filteredBookshelfItems.map((item) => ('hash' in item ? item.hash : item.id)),
+        );
+      } else if (isSelectNone) {
+        setSelectedBooks([]);
+      }
+    } else {
+      setSelectedBooks([]);
+      setShowSelectModeActions(false);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isSelectMode, isSelectAll, isSelectNone]);
+
   return (
     <div className='bookshelf'>
       <div