diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 4ad4a9927..d86960a0d 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -49,6 +49,11 @@ int androidVersion = 0;
 int windowsBuildNumber = 0;
 DesktopType? desktopType;
 
+/// Check if the app is running with single view mode.
+bool isSingleViewApp() {
+  return desktopType == DesktopType.cm;
+}
+
 /// * debug or test only, DO NOT enable in release build
 bool isTest = false;
 
diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart
index b66a08e74..252e1cd12 100644
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -1,11 +1,13 @@
 // original cm window in Sciter version.
 
 import 'dart:async';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/models/chat_model.dart';
+import 'package:flutter_hbb/utils/platform_channel.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:window_manager/window_manager.dart';
@@ -47,8 +49,17 @@ class _DesktopServerPageState extends State<DesktopServerPage>
 
   @override
   void onWindowClose() {
-    gFFI.serverModel.closeAll();
-    gFFI.close();
+    Future.wait([
+      gFFI.serverModel.closeAll(),
+      gFFI.close()
+    ]).then((_)  {
+      if (Platform.isMacOS) {
+        RdPlatformChannel.instance.terminate();
+      } else {
+        windowManager.setPreventClose(false);
+        windowManager.close();
+      }
+    });
     super.onWindowClose();
   }
 
diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index add1289e2..eb837ba70 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -1399,12 +1399,12 @@ class FFI {
       await setCanvasConfig(id, cursorModel.x, cursorModel.y, canvasModel.x,
           canvasModel.y, canvasModel.scale, ffiModel.pi.currentDisplay);
     }
-    bind.sessionClose(id: id);
     imageModel.update(null);
     cursorModel.clear();
     ffiModel.clear();
     canvasModel.clear();
     inputModel.resetModifiers();
+    await bind.sessionClose(id: id);
     debugPrint('model $id closed');
     id = '';
   }
diff --git a/flutter/lib/models/server_model.dart b/flutter/lib/models/server_model.dart
index aab12ab5d..b2043f3c2 100644
--- a/flutter/lib/models/server_model.dart
+++ b/flutter/lib/models/server_model.dart
@@ -560,10 +560,8 @@ class ServerModel with ChangeNotifier {
     }
   }
 
-  closeAll() {
-    for (var client in _clients) {
-      bind.cmCloseConnection(connId: client.id);
-    }
+  Future<void> closeAll() async {
+    await Future.wait(_clients.map((client) => bind.cmCloseConnection(connId: client.id)));
     _clients.clear();
     tabController.state.value.tabs.clear();
   }