diff --git a/src/screens/EpubReaderChapterSelectionScreen.cpp b/src/screens/EpubReaderChapterSelectionScreen.cpp
index 99bff76..26688a4 100644
--- a/src/screens/EpubReaderChapterSelectionScreen.cpp
+++ b/src/screens/EpubReaderChapterSelectionScreen.cpp
@@ -13,41 +13,13 @@ void EpubReaderChapterSelectionScreen::taskTrampoline(void* param) {
   self->displayTaskLoop();
 }
 
-void EpubReaderChapterSelectionScreen::rebuildVisibleSpineIndices() {
-  visibleSpineIndices.clear();
-  if (!epub) {
-    return;
-  }
-
-  const int spineCount = epub->getSpineItemsCount();
-  visibleSpineIndices.reserve(spineCount);
-  for (int i = 0; i < spineCount; i++) {
-    if (epub->getTocIndexForSpineIndex(i) != -1) {
-      visibleSpineIndices.push_back(i);
-    }
-  }
-}
-
 void EpubReaderChapterSelectionScreen::onEnter() {
   if (!epub) {
     return;
   }
 
   renderingMutex = xSemaphoreCreateMutex();
-  rebuildVisibleSpineIndices();
-
-  selectorIndex = 0;
-  if (!visibleSpineIndices.empty()) {
-    for (size_t i = 0; i < visibleSpineIndices.size(); i++) {
-      if (visibleSpineIndices[i] == currentSpineIndex) {
-        selectorIndex = static_cast<int>(i);
-        break;
-      }
-    }
-    if (selectorIndex >= static_cast<int>(visibleSpineIndices.size())) {
-      selectorIndex = static_cast<int>(visibleSpineIndices.size()) - 1;
-    }
-  }
+  selectorIndex = currentSpineIndex;
 
   // Trigger first update
   updateRequired = true;
@@ -68,7 +40,6 @@ void EpubReaderChapterSelectionScreen::onExit() {
   }
   vSemaphoreDelete(renderingMutex);
   renderingMutex = nullptr;
-  visibleSpineIndices.clear();
 }
 
 void EpubReaderChapterSelectionScreen::handleInput() {
@@ -80,53 +51,22 @@ void EpubReaderChapterSelectionScreen::handleInput() {
   const bool skipPage = inputManager.getHeldTime() > SKIP_PAGE_MS;
 
   if (inputManager.wasPressed(InputManager::BTN_CONFIRM)) {
-    if (!visibleSpineIndices.empty()) {
-      if (selectorIndex >= static_cast<int>(visibleSpineIndices.size())) {
-        selectorIndex = static_cast<int>(visibleSpineIndices.size()) - 1;
-      }
-      onSelectSpineIndex(visibleSpineIndices[selectorIndex]);
-    }
-    return;
-  }
-
-  if (inputManager.wasPressed(InputManager::BTN_BACK)) {
+    onSelectSpineIndex(selectorIndex);
+  } else if (inputManager.wasPressed(InputManager::BTN_BACK)) {
     onGoBack();
-    return;
-  }
-
-  const int chapterCount = static_cast<int>(visibleSpineIndices.size());
-  if (chapterCount == 0) {
-    return;
-  }
-
-  if (selectorIndex >= chapterCount) {
-    selectorIndex = chapterCount - 1;
-  }
-
-  if (prevReleased) {
+  } else if (prevReleased) {
     if (skipPage) {
-      const int totalPages = (chapterCount + PAGE_ITEMS - 1) / PAGE_ITEMS;
-      int currentPage = selectorIndex / PAGE_ITEMS;
-      currentPage = (currentPage + totalPages - 1) % totalPages;
-      selectorIndex = currentPage * PAGE_ITEMS;
-      if (selectorIndex >= chapterCount) {
-        selectorIndex = chapterCount - 1;
-      }
+      selectorIndex =
+          ((selectorIndex / PAGE_ITEMS - 1) * PAGE_ITEMS + epub->getSpineItemsCount()) % epub->getSpineItemsCount();
     } else {
-      selectorIndex = (selectorIndex + chapterCount - 1) % chapterCount;
+      selectorIndex = (selectorIndex + epub->getSpineItemsCount() - 1) % epub->getSpineItemsCount();
     }
     updateRequired = true;
   } else if (nextReleased) {
     if (skipPage) {
-      const int totalPages = (chapterCount + PAGE_ITEMS - 1) / PAGE_ITEMS;
-      int currentPage = selectorIndex / PAGE_ITEMS;
-      currentPage = (currentPage + 1) % totalPages;
-      selectorIndex = currentPage * PAGE_ITEMS;
-      if (selectorIndex >= chapterCount) {
-        selectorIndex = chapterCount - 1;
-      }
+      selectorIndex = ((selectorIndex / PAGE_ITEMS + 1) * PAGE_ITEMS) % epub->getSpineItemsCount();
     } else {
-      selectorIndex = (selectorIndex + 1) % chapterCount;
+      selectorIndex = (selectorIndex + 1) % epub->getSpineItemsCount();
     }
     updateRequired = true;
   }
@@ -150,28 +90,17 @@ void EpubReaderChapterSelectionScreen::renderScreen() {
   const auto pageWidth = renderer.getScreenWidth();
   renderer.drawCenteredText(READER_FONT_ID, 10, "Select Chapter", true, BOLD);
 
-  const int chapterCount = static_cast<int>(visibleSpineIndices.size());
-  if (chapterCount == 0) {
-    renderer.drawText(UI_FONT_ID, 20, 60, "No chapters available");
-    renderer.displayBuffer();
-    return;
-  }
-
-  if (selectorIndex >= chapterCount) {
-    selectorIndex = chapterCount - 1;
-  }
-
   const auto pageStartIndex = selectorIndex / PAGE_ITEMS * PAGE_ITEMS;
   renderer.fillRect(0, 60 + (selectorIndex % PAGE_ITEMS) * 30 + 2, pageWidth - 1, 30);
-  for (int i = pageStartIndex; i < chapterCount && i < pageStartIndex + PAGE_ITEMS; i++) {
-    const int spineIndex = visibleSpineIndices[i];
-    const int tocIndex = epub->getTocIndexForSpineIndex(spineIndex);
+  for (int i = pageStartIndex; i < epub->getSpineItemsCount() && i < pageStartIndex + PAGE_ITEMS; i++) {
+    const int tocIndex = epub->getTocIndexForSpineIndex(i);
     if (tocIndex == -1) {
-      continue;  // Filtered chapters should not reach here, but skip defensively.
+      renderer.drawText(UI_FONT_ID, 20, 60 + (i % PAGE_ITEMS) * 30, "Unnamed", i != selectorIndex);
+    } else {
+      auto item = epub->getTocItem(tocIndex);
+      renderer.drawText(UI_FONT_ID, 20 + (item.level - 1) * 15, 60 + (i % PAGE_ITEMS) * 30, item.title.c_str(),
+                        i != selectorIndex);
     }
-    auto item = epub->getTocItem(tocIndex);
-    renderer.drawText(UI_FONT_ID, 20 + (item.level - 1) * 15, 60 + (i % PAGE_ITEMS) * 30, item.title.c_str(),
-                      i != selectorIndex);
   }
 
   renderer.displayBuffer();
diff --git a/src/screens/EpubReaderChapterSelectionScreen.h b/src/screens/EpubReaderChapterSelectionScreen.h
index 0ba41f0..8cac4cb 100644
--- a/src/screens/EpubReaderChapterSelectionScreen.h
+++ b/src/screens/EpubReaderChapterSelectionScreen.h
@@ -5,7 +5,6 @@
 #include <freertos/task.h>
 
 #include <memory>
-#include <vector>
 
 #include "Screen.h"
 
@@ -16,13 +15,11 @@ class EpubReaderChapterSelectionScreen final : public Screen {
   int currentSpineIndex = 0;
   int selectorIndex = 0;
   bool updateRequired = false;
-  std::vector<int> visibleSpineIndices;
   const std::function<void()> onGoBack;
   const std::function<void(int newSpineIndex)> onSelectSpineIndex;
 
   static void taskTrampoline(void* param);
   [[noreturn]] void displayTaskLoop();
-  void rebuildVisibleSpineIndices();
   void renderScreen();
 
  public: