diff --git a/lib/pages/discover/search_page.dart b/lib/pages/discover/search_page.dart
index c5754da..f93779c 100644
--- a/lib/pages/discover/search_page.dart
+++ b/lib/pages/discover/search_page.dart
@@ -35,9 +35,6 @@ class _SearchPageState extends State<SearchPage> {
     super.initState();
     _logic = DiscoverBinding().create(search: context.read<SearchRepository>());
     _logic.addListener(_rebuild);
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (mounted) _logic.searchFocus.requestFocus();
-    });
   }
 
   void _rebuild() {
@@ -59,21 +56,27 @@ class _SearchPageState extends State<SearchPage> {
       value: SystemUiOverlayStyle.light,
       child: Theme(
         data: AppTheme.dark(),
-        child: Scaffold(
-          key: const Key('search-page'),
-          backgroundColor: AppColors.appBackground,
-          body: SafeArea(
-            child: Column(
-              children: [
-                _header(l10n),
-                Expanded(
-                  child: AppPullToRefresh(
-                    key: const Key('search-refresh'),
-                    onRefresh: _logic.refreshSearch,
-                    child: _body(l10n),
+        child: MediaQuery.removeViewInsets(
+          context: context,
+          removeBottom: true,
+          child: Scaffold(
+            key: const Key('search-page'),
+            backgroundColor: AppColors.appBackground,
+            resizeToAvoidBottomInset: false,
+            body: SafeArea(
+              bottom: false,
+              child: Column(
+                children: [
+                  _header(l10n),
+                  Expanded(
+                    child: AppPullToRefresh(
+                      key: const Key('search-refresh'),
+                      onRefresh: _logic.refreshSearch,
+                      child: _body(l10n),
+                    ),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
           ),
         ),
@@ -157,6 +160,7 @@ class _SearchPageState extends State<SearchPage> {
                 focusedBorder: InputBorder.none,
                 contentPadding: EdgeInsets.zero,
               ),
+              scrollPadding: EdgeInsets.zero,
             ),
           ),
           if (_logic.searchLoading)