diff --git a/apps/readest-app/src/app/library/components/Bookshelf.tsx b/apps/readest-app/src/app/library/components/Bookshelf.tsx
index 65ab8aa2..f896e786 100644
--- a/apps/readest-app/src/app/library/components/Bookshelf.tsx
+++ b/apps/readest-app/src/app/library/components/Bookshelf.tsx
@@ -68,7 +68,7 @@ const Bookshelf: React.FC<BookshelfProps> = ({
   );
   const isImportingBook = useRef(false);
 
-  const { currentBookshelf, setCurrentBookshelf, setLibrary } = useLibraryStore();
+  const { setCurrentBookshelf, setLibrary } = useLibraryStore();
   const allBookshelfItems =
     viewMode === 'grid' ? generateGridItems(libraryBooks) : generateListItems(libraryBooks);
 
@@ -234,7 +234,8 @@ const Bookshelf: React.FC<BookshelfProps> = ({
     }
   };
   const sortOrderMultiplier = sortOrder === 'asc' ? 1 : -1;
-  const filteredBookshelfItems = currentBookshelf
+  const currentBookshelfItems = navBooksGroup ? navBooksGroup.books : allBookshelfItems;
+  const filteredBookshelfItems = currentBookshelfItems
     .filter((item) => {
       if ('name' in item) return item.books.some((book) => bookFilter(book, queryTerm || ''));
       else if (queryTerm) return bookFilter(item, queryTerm);