diff --git a/lib/main.dart b/lib/main.dart
index bee3eae..c5204a7 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -231,17 +231,19 @@ class _MainState extends ConsumerState<Main> with WindowListener, WidgetsBinding
 
     if (_isDesktop) {
       WindowOptions windowOptions = WindowOptions(
-          size: Size(clientSettings.size.x, clientSettings.size.y),
-          center: true,
-          backgroundColor: Colors.transparent,
-          skipTaskbar: false,
-          titleBarStyle: TitleBarStyle.hidden,
-          title: packageInfo.appName.capitalize());
+        backgroundColor: Colors.transparent,
+        skipTaskbar: false,
+        titleBarStyle: TitleBarStyle.hidden,
+        title: packageInfo.appName.capitalize(),
+      );
 
       windowManager.waitUntilReadyToShow(windowOptions, () async {
-        await windowManager.show();
-
-        await windowManager.focus();
+        if (!kDebugMode) {
+          await windowManager.show();
+          await windowManager.focus();
+          await windowManager.setSize(Size(clientSettings.size.x, clientSettings.size.y));
+          await windowManager.center();
+        }
         final startupArguments = ref.read(argumentsStateProvider);
         if (startupArguments.htpcMode && !(await windowManager.isFullScreen())) {
           await windowManager.setFullScreen(true);
diff --git a/lib/widgets/shared/pull_to_refresh.dart b/lib/widgets/shared/pull_to_refresh.dart
index 38eb684..9da5c5f 100644
--- a/lib/widgets/shared/pull_to_refresh.dart
+++ b/lib/widgets/shared/pull_to_refresh.dart
@@ -1,10 +1,12 @@
-import 'package:fladder/util/adaptive_layout/adaptive_layout.dart';
-import 'package:fladder/util/refresh_state.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+import 'package:fladder/util/adaptive_layout/adaptive_layout.dart';
+import 'package:fladder/util/refresh_state.dart';
+
 class PullToRefresh extends ConsumerStatefulWidget {
   final GlobalKey<RefreshIndicatorState>? refreshKey;
   final double? displacement;
@@ -68,7 +70,7 @@ class _PullToRefreshState extends ConsumerState<PullToRefresh> {
           return KeyEventResult.ignored;
         },
         child: widget.onRefresh != null
-            ? RefreshIndicator.adaptive(
+            ? RefreshIndicator(
                 displacement: widget.displacement ?? 80 + MediaQuery.of(context).viewPadding.top,
                 key: refreshKey,
                 onRefresh: widget.onRefresh!,