From 137232eafdcc6475a7899501d5dad77fb29d37dd Mon Sep 17 00:00:00 2001
From: Fabian Freund <github@fabi.online>
Date: Sun, 4 Jan 2026 08:56:13 +0100
Subject: [PATCH] fix search field focus issue

---
 .../search/presentation/screens/search.dart       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/lib/features/geckoview/features/search/presentation/screens/search.dart b/app/lib/features/geckoview/features/search/presentation/screens/search.dart
index 887b8b7e..077929d7 100644
--- a/app/lib/features/geckoview/features/search/presentation/screens/search.dart
+++ b/app/lib/features/geckoview/features/search/presentation/screens/search.dart
@@ -81,6 +81,21 @@ class SearchScreen extends HookConsumerWidget {
     );
     final searchFocusNode = useFocusNode();
 
+    useOnAppLifecycleStateChange((previous, current) {
+      switch (current) {
+        case AppLifecycleState.detached:
+        case AppLifecycleState.inactive:
+        case AppLifecycleState.hidden:
+        case AppLifecycleState.paused:
+          //Fixes issue with disappearing keyboard after resume (even we request focus)
+          searchFocusNode.unfocus();
+        case AppLifecycleState.resumed:
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            searchFocusNode.requestFocus();
+          });
+      }
+    });
+
     final defaultSearchBang = ref.watch(
       defaultSearchBangDataProvider.select((value) => value.value),
     );