diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index f4e0c2d75..6ee57ef50 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -608,12 +608,11 @@ class CustomAlertDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    FocusNode focusNode = FocusNode();
-    // request focus if there is no focused FocusNode in the dialog
-    Future.delayed(Duration.zero, () {
-      if (!focusNode.hasFocus) focusNode.requestFocus();
-    });
+    // request focus
     FocusScopeNode scopeNode = FocusScopeNode();
+    Future.delayed(Duration.zero, () {
+      if (!scopeNode.hasFocus) scopeNode.requestFocus();
+    });
     return FocusScope(
       node: scopeNode,
       autofocus: true,
diff --git a/flutter/lib/common/widgets/login.dart b/flutter/lib/common/widgets/login.dart
index 2f10ac005..05fc1fc5c 100644
--- a/flutter/lib/common/widgets/login.dart
+++ b/flutter/lib/common/widgets/login.dart
@@ -666,6 +666,8 @@ Future<bool?> verificationCodeDialog(UserPayload? user) async {
                 child: const LinearProgressIndicator()),
           ],
         ),
+        onCancel: close,
+        onSubmit: onVerify,
         actions: [
           dialogButton("Cancel", onPressed: close, isOutline: true),
           dialogButton("Verify", onPressed: onVerify),
diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart
index 62289d5f0..b9d793744 100644
--- a/flutter/lib/desktop/widgets/remote_menubar.dart
+++ b/flutter/lib/desktop/widgets/remote_menubar.dart
@@ -653,6 +653,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
         ));
       }
       if (pi.platform != kPeerPlatformAndroid &&
+          pi.platform != kPeerPlatformMacOS && // unsupport yet
           version_cmp(peer_version, '1.2.0') >= 0) {
         displayMenu.add(MenuEntryButton<String>(
           childBuilder: (TextStyle? style) => Text(