diff --git a/src/activities/library/LibraryListActivity.cpp b/src/activities/library/LibraryListActivity.cpp
index 03f0de9..f5f3d93 100644
--- a/src/activities/library/LibraryListActivity.cpp
+++ b/src/activities/library/LibraryListActivity.cpp
@@ -675,14 +675,15 @@ bool LibraryListActivity::handleButtons() {
 
 void LibraryListActivity::navigateButtons() {
   const int count = listCount();
-  const int ringSize = count + 1;
   auto& nav = activeNav();
-  buttonNavigator.onNextRelease([this, ringSize] { moveRingTo(ButtonNavigator::nextIndex(ringPos(), ringSize)); });
-  buttonNavigator.onPreviousRelease([this, ringSize] {
+  buttonNavigator.onNextRelease([this, count] {
+    if (count > 0) moveRingTo(ringPos() == count ? 1 : ringPos() + 1);
+  });
+  buttonNavigator.onPreviousRelease([this, count] {
     if (tabsFocused() && !degraded) {
       openSearch();
-    } else {
-      moveRingTo(ButtonNavigator::previousIndex(ringPos(), ringSize));
+    } else if (count > 0) {
+      moveRingTo(ringPos() <= 1 ? count : ringPos() - 1);
     }
   });
   // A held button steps tabs while the strip has focus (the base behaviour
diff --git a/src/activities/reader/EpubReaderMenuActivity.cpp b/src/activities/reader/EpubReaderMenuActivity.cpp
index c3bf717..613808c 100644
--- a/src/activities/reader/EpubReaderMenuActivity.cpp
+++ b/src/activities/reader/EpubReaderMenuActivity.cpp
@@ -48,7 +48,6 @@ void EpubReaderMenuActivity::buildMenuItems(std::vector<MenuItem>& items, bool h
     items.push_back({MenuAction::BOOKMARKS, StrId::STR_BOOKMARKS});
   }
   items.push_back({MenuAction::TOGGLE_BOOKMARK, StrId::STR_TOGGLE_BOOKMARK});
-  items.push_back({MenuAction::TEXT_SETTINGS, StrId::STR_TEXT_SETTINGS});
   items.push_back({MenuAction::NIGHT_MODE, StrId::STR_NIGHT_MODE});
   if (Frontlight.present()) {
     items.push_back({MenuAction::FRONTLIGHT, StrId::STR_FRONTLIGHT});
@@ -62,6 +61,7 @@ void EpubReaderMenuActivity::buildMenuItems(std::vector<MenuItem>& items, bool h
   items.push_back({MenuAction::GO_HOME, StrId::STR_GO_HOME_BUTTON});
   items.push_back({MenuAction::SYNC, StrId::STR_SYNC_PROGRESS});
   items.push_back({MenuAction::DELETE_CACHE, StrId::STR_DELETE_CACHE});
+  items.push_back({MenuAction::TEXT_SETTINGS, StrId::STR_TEXT_SETTINGS});
 }
 
 void EpubReaderMenuActivity::closeCancelled() {