diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
index 46a243b1a0..b892f30b6e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
@@ -95,6 +95,20 @@ open class GlobalSearchController(
         )
 
         optionsMenuSearchItem = menu.findItem(R.id.action_search)
+
+        // Focus search on launch from browse screen
+        if (initialQuery.isNullOrEmpty()) {
+            optionsMenuSearchItem?.expandActionView()
+        }
+    }
+
+    override fun onSearchMenuItemActionCollapse(item: MenuItem?) {
+        super.onSearchMenuItemActionCollapse(item)
+        // Close this screen if query is empty
+        // i.e. launch from browse screen and clicking the back button icon without making any search
+        if (presenter.query.isEmpty()) {
+            router.popCurrentController()
+        }
     }
 
     override fun onSearchMenuItemActionExpand(item: MenuItem?) {