diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart
index 53088f69e..b1ebf9d71 100644
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -186,7 +186,7 @@ class ConnectionManagerState extends State<ConnectionManager> {
                                       ChatPage(type: ChatPageType.desktopCM)),
                             ),
                           )
-                        : Expanded(child: Container()),
+                        : Offstage(),
                   ),
                   SizedBox(
                     width: kConnectionManagerWindowSizeClosedChat.width -
diff --git a/flutter/lib/models/chat_model.dart b/flutter/lib/models/chat_model.dart
index 48476951f..fe1de2512 100644
--- a/flutter/lib/models/chat_model.dart
+++ b/flutter/lib/models/chat_model.dart
@@ -277,16 +277,16 @@ class ChatModel with ChangeNotifier {
       gFFI.chatModel.changeCurrentKey(key);
     }
     if (_isShowCMChatPage) {
-      await windowManager.setSizeAlignment(
-          kConnectionManagerWindowSizeClosedChat, Alignment.topRight);
-      await windowManager.show();
       _isShowCMChatPage = !_isShowCMChatPage;
       notifyListeners();
+      await windowManager.show();
+      await windowManager.setSizeAlignment(
+          kConnectionManagerWindowSizeClosedChat, Alignment.topRight);
     } else {
       requestChatInputFocus();
+      await windowManager.show();
       await windowManager.setSizeAlignment(
           kConnectionManagerWindowSizeOpenChat, Alignment.topRight);
-      await windowManager.show();
       _isShowCMChatPage = !_isShowCMChatPage;
       notifyListeners();
     }