diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
index ae159e8ee..b97f445de 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt
@@ -473,6 +473,9 @@ open class BrowseSourceScreenModel(
                 }
             }
             state.copy(selection = newSelection)
+        }.also {
+            if (state.value.selection.isEmpty())
+                toggleSelectionMode()
         }
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/SearchScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/SearchScreenModel.kt
index 901623662..6eeae8bd7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/SearchScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/SearchScreenModel.kt
@@ -249,6 +249,9 @@ abstract class SearchScreenModel(
                 }
             }
             state.copy(selection = newSelection)
+        }.also {
+            if (state.value.selection.isEmpty())
+                toggleSelectionMode()
         }
     }