diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart
index 1192bec3a..25be23142 100644
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -183,19 +183,14 @@ class ConnectionManagerState extends State<ConnectionManager> {
                                                   .dividerColor))),
                                   child: ChatPage()),
                             ),
-                            flex: (kConnectionManagerWindowSizeOpenChat.width -
-                                    kConnectionManagerWindowSizeClosedChat
-                                        .width)
-                                .toInt(),
                           )
                         : Offstage(),
                   ),
-                  Expanded(
-                      child: pageView,
-                      flex: kConnectionManagerWindowSizeClosedChat.width
-                              .toInt() -
-                          4 // prevent stretch of the page view when chat is open,
-                      ),
+                  SizedBox(
+                    width: kConnectionManagerWindowSizeClosedChat.width -
+                        10, // 10 is from overflow
+                    child: pageView,
+                  )
                 ],
               ),
             ),
diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart
index 6ff703f6a..59ff18615 100644
--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@@ -225,6 +225,7 @@ void runConnectionManagerScreen(bool hide) async {
   } else {
     await showCmWindow(isStartup: true);
   }
+  windowManager.setResizable(false);
   // Start the uni links handler and redirect links to Native, not for Flutter.
   listenUniLinks(handleByFlutter: false);
 }