diff --git a/flutter/lib/models/file_model.dart b/flutter/lib/models/file_model.dart
index e4afc892f..4a96e6e73 100644
--- a/flutter/lib/models/file_model.dart
+++ b/flutter/lib/models/file_model.dart
@@ -199,6 +199,7 @@ class FileModel extends ChangeNotifier {
 
   onClose() {
     SmartDialog.dismiss();
+    jobReset();
 
     // save config
     Map<String, String> msg = Map();
diff --git a/flutter/lib/pages/file_manager_page.dart b/flutter/lib/pages/file_manager_page.dart
index 2cb980f44..7e9c39a4e 100644
--- a/flutter/lib/pages/file_manager_page.dart
+++ b/flutter/lib/pages/file_manager_page.dart
@@ -28,6 +28,7 @@ class _FileManagerPageState extends State<FileManagerPage> {
   void initState() {
     super.initState();
     FFI.connect(widget.id, isFileTransfer: true);
+    showLoading(translate('Connecting...'));
     FFI.ffiModel.updateEventListener(widget.id);
     Wakelock.enable();
   }
diff --git a/flutter/lib/pages/settings_page.dart b/flutter/lib/pages/settings_page.dart
index 30eb88b7b..ea92a72ca 100644
--- a/flutter/lib/pages/settings_page.dart
+++ b/flutter/lib/pages/settings_page.dart
@@ -26,11 +26,11 @@ class SettingsPage extends StatefulWidget implements PageShape {
   _SettingsState createState() => _SettingsState();
 }
 
-class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
-  static const url = 'https://rustdesk.com/';
-  final _hasIgnoreBattery = androidVersion >= 26;
-  var _ignoreBatteryOpt = false;
+const url = 'https://rustdesk.com/';
+final _hasIgnoreBattery = androidVersion >= 26;
+var _ignoreBatteryOpt = false;
 
+class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
   @override
   void initState() {
     super.initState();