diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart
index 227002645..62289d5f0 100644
--- a/flutter/lib/desktop/widgets/remote_menubar.dart
+++ b/flutter/lib/desktop/widgets/remote_menubar.dart
@@ -652,8 +652,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
           dismissOnClicked: true,
         ));
       }
-      if (false &&
-          pi.platform != kPeerPlatformAndroid &&
+      if (pi.platform != kPeerPlatformAndroid &&
           version_cmp(peer_version, '1.2.0') >= 0) {
         displayMenu.add(MenuEntryButton<String>(
           childBuilder: (TextStyle? style) => Text(
diff --git a/src/server/connection.rs b/src/server/connection.rs
index c8814a3b1..d3f7ac149 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -1583,6 +1583,7 @@ impl Connection {
                                 uuid.to_string().as_ref(),
                             ])
                             .ok();
+                            self.on_close_manually("switch sides", "peer");
                             return false;
                         }
                     }