diff --git a/src/activities/browser/OpdsBookBrowserActivity.cpp b/src/activities/browser/OpdsBookBrowserActivity.cpp
index 44939aee..8a363b25 100644
--- a/src/activities/browser/OpdsBookBrowserActivity.cpp
+++ b/src/activities/browser/OpdsBookBrowserActivity.cpp
@@ -88,9 +88,6 @@ void OpdsBookBrowserActivity::loop() {
   // Handle WiFi check state - only Back works
   if (state == BrowserState::CHECK_WIFI) {
     if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
-      if (subActivity) {
-        exitActivity();
-      }
       onGoHome();
     }
     return;
diff --git a/src/activities/settings/WifiConnectionsActivity.cpp b/src/activities/settings/WifiConnectionsActivity.cpp
index fc4913b9..d3fc8fe9 100644
--- a/src/activities/settings/WifiConnectionsActivity.cpp
+++ b/src/activities/settings/WifiConnectionsActivity.cpp
@@ -185,8 +185,8 @@ void WifiConnectionsActivity::deleteNetwork() {
 
   const auto& credentials = WIFI_STORE.getCredentials();
   const size_t totalItems = credentials.size() + 1;
-  if (selectorIndex > credentials.size()) {
-    selectorIndex = credentials.size();
+  if (selectorIndex >= totalItems) {
+    selectorIndex = totalItems - 1;
   }
 
   state = State::LIST;