diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 1a0d59e16..26398b7e4 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -110,10 +111,15 @@ backToHome() {
   Navigator.popUntil(globalKey.currentContext!, ModalRoute.withName("/"));
 }
 
-void window_on_top() {
-  windowManager.restore();
-  windowManager.show();
-  windowManager.focus();
+void window_on_top(int? id) {
+  if (id == null) {
+    // main window
+    windowManager.restore();
+    windowManager.show();
+    windowManager.focus();
+  } else {
+    WindowController.fromWindowId(id)..focus()..show();
+  }
 }
 
 typedef DialogBuilder = CustomAlertDialog Function(
diff --git a/flutter/lib/desktop/pages/connection_tab_page.dart b/flutter/lib/desktop/pages/connection_tab_page.dart
index 8de2d84d0..ffe984943 100644
--- a/flutter/lib/desktop/pages/connection_tab_page.dart
+++ b/flutter/lib/desktop/pages/connection_tab_page.dart
@@ -49,9 +49,9 @@ class _ConnectionTabPageState extends State<ConnectionTabPage>
           "call ${call.method} with args ${call.arguments} from window ${fromWindowId}");
       // for simplify, just replace connectionId
       if (call.method == "new_remote_desktop") {
-        window_on_top();
         final args = jsonDecode(call.arguments);
         final id = args['id'];
+        window_on_top(windowId());
         final indexOf = connectionIds.indexOf(id);
         if (indexOf >= 0) {
           initialIndex = indexOf;
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index a8f2e51af..e8cd7eff6 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -472,7 +472,7 @@ class _DesktopHomePageState extends State<DesktopHomePage> with TrayListener, Wi
       print(
           "call ${call.method} with args ${call.arguments} from window ${fromWindowId}");
       if (call.method == "main_window_on_top") {
-        window_on_top();
+        window_on_top(null);
       }
     });
   }
diff --git a/flutter/lib/desktop/pages/file_manager_tab_page.dart b/flutter/lib/desktop/pages/file_manager_tab_page.dart
index 723975d62..c06dd331d 100644
--- a/flutter/lib/desktop/pages/file_manager_tab_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_tab_page.dart
@@ -46,9 +46,9 @@ class _FileManagerTabPageState extends State<FileManagerTabPage>
           "call ${call.method} with args ${call.arguments} from window ${fromWindowId}");
       // for simplify, just replace connectionId
       if (call.method == "new_file_transfer") {
-        window_on_top();
         final args = jsonDecode(call.arguments);
         final id = args['id'];
+        window_on_top(windowId());
         final indexOf = connectionIds.indexOf(id);
         if (indexOf >= 0) {
           initialIndex = indexOf;