diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
index aa58822fd1..edb110f394 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
@@ -25,6 +25,7 @@ import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayout
 import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.backup.BackupRestoreService
 import eu.kanade.tachiyomi.data.database.models.History
@@ -454,17 +455,19 @@ class RecentsController(bundle: Bundle? = null) :
         setBottomPadding()
         binding.downloadBottomSheet.dlBottomSheet.update()
 
-        val searchItem =
-            (activity as? MainActivity)?.binding?.cardToolbar?.menu?.findItem(R.id.action_search)
-        val searchView = searchItem?.actionView as? SearchView ?: return
-        if (router.backstack.lastOrNull()?.controller != this) return
-        setOnQueryTextChangeListener(searchView) {
-            if (query != it) {
-                query = it ?: return@setOnQueryTextChangeListener false
-                resetProgressItem()
-                refresh()
+        if (BuildConfig.DEBUG && query.isBlank()) {
+            val searchItem =
+                (activity as? MainActivity)?.binding?.cardToolbar?.menu?.findItem(R.id.action_search)
+            val searchView = searchItem?.actionView as? SearchView ?: return
+            if (router.backstack.lastOrNull()?.controller != this) return
+            setOnQueryTextChangeListener(searchView) {
+                if (query != it) {
+                    query = it ?: return@setOnQueryTextChangeListener false
+                    resetProgressItem()
+                    refresh()
+                }
+                true
             }
-            true
         }
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt
index 0b12c56e15..eec8fc52ac 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt
@@ -18,6 +18,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
+import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@@ -465,11 +466,14 @@ open class BrowseSourceController(bundle: Bundle) :
     override fun onActivityResumed(activity: Activity) {
         super.onActivityResumed(activity)
 
-        val searchItem = (activity as? MainActivity)?.binding?.cardToolbar?.menu?.findItem(R.id.action_search)
-        val searchView = searchItem?.actionView as? SearchView ?: return
-        setOnQueryTextChangeListener(searchView, onlyOnSubmit = true, hideKbOnSubmit = false) {
-            searchWithQuery(it ?: "")
-            true
+        if (BuildConfig.DEBUG && presenter.query.isBlank()) {
+            val searchItem =
+                (activity as? MainActivity)?.binding?.cardToolbar?.menu?.findItem(R.id.action_search)
+            val searchView = searchItem?.actionView as? SearchView ?: return
+            setOnQueryTextChangeListener(searchView, onlyOnSubmit = true, hideKbOnSubmit = false) {
+                searchWithQuery(it ?: "")
+                true
+            }
         }
     }