diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 99b077f..d7d3dd3 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -477,7 +477,9 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
       providers: [
         ChangeNotifierProvider<CameraProviderWithCache>(create: (_) => CameraProviderWithCache()),
       ],
-      child: Scaffold(
+      child: MediaQuery(
+        data: MediaQuery.of(context).copyWith(viewInsets: EdgeInsets.zero),
+        child: Scaffold(
         key: _scaffoldKey,
         appBar: AppBar(
           automaticallyImplyLeading: false, // Disable automatic back button
@@ -606,6 +608,7 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
           ],
         ),
       ),
+      ),
     );
   }
 }
diff --git a/lib/widgets/map_view.dart b/lib/widgets/map_view.dart
index 1acac3a..93d6942 100644
--- a/lib/widgets/map_view.dart
+++ b/lib/widgets/map_view.dart
@@ -525,16 +525,13 @@ class MapViewState extends State<MapView> {
         ),
 
         // All map overlays (mode indicator, zoom, attribution, add pin)
-        MediaQuery(
-          data: MediaQuery.of(context).copyWith(viewInsets: EdgeInsets.zero),
-          child: MapOverlays(
-            mapController: _controller.mapController,
-            uploadMode: appState.uploadMode,
-            session: session,
-            editSession: editSession,
-            attribution: appState.selectedTileType?.attribution,
-            onSearchPressed: widget.onSearchPressed,
-          ),
+        MapOverlays(
+          mapController: _controller.mapController,
+          uploadMode: appState.uploadMode,
+          session: session,
+          editSession: editSession,
+          attribution: appState.selectedTileType?.attribution,
+          onSearchPressed: widget.onSearchPressed,
         ),
 
         // Network status indicator (top-left) - conditionally shown