diff --git a/lib/main.dart b/lib/main.dart
index 355b4cc..702b505 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -95,16 +95,21 @@ class MyHomePage extends StatelessWidget {
     final controller = Get.put(_MainController());
 
     return Scaffold(
-        body: Obx(
-          () => FadeIndexedStack(
-            lazy: true,
-            index: controller.selectedIndex.value,
-            children: [
-              WebScreen(key: webGlobalKey),
-              const OpenListScreen(),
-              const DownloadManagerPage(),
-              const SettingsScreen()
-            ],
+        // Wrap body with SafeArea to handle small window mode properly
+        body: SafeArea(
+          child: Obx(
+            () => SizedBox.expand(
+              child: FadeIndexedStack(
+                lazy: true,
+                index: controller.selectedIndex.value,
+                children: [
+                  WebScreen(key: webGlobalKey),
+                  const OpenListScreen(),
+                  const DownloadManagerPage(),
+                  const SettingsScreen()
+                ],
+              ),
+            ),
           ),
         ),
         bottomNavigationBar: Obx(() => NavigationBar(
diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart
index 750a0d2..f0e7660 100644
--- a/lib/pages/settings/settings.dart
+++ b/lib/pages/settings/settings.dart
@@ -46,7 +46,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
         body: Obx(
       () => ListView(
         children: [
-          // SizedBox(height: MediaQuery.of(context).padding.top),
           Visibility(
             visible: !controller._managerStorageGranted.value ||
                 !controller._notificationGranted.value ||
diff --git a/lib/pages/web/web.dart b/lib/pages/web/web.dart
index 9d67d4f..5d12291 100644
--- a/lib/pages/web/web.dart
+++ b/lib/pages/web/web.dart
@@ -71,7 +71,6 @@ class WebScreenState extends State<WebScreen> {
         },
         child: Scaffold(
           body: Column(children: <Widget>[
-            SizedBox(height: MediaQuery.of(context).padding.top),
             LinearProgressIndicator(
               value: _progress,
               backgroundColor: Colors.grey[200],