diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart
index db1721d99..2a84dcf14 100644
--- a/flutter/lib/desktop/widgets/remote_menubar.dart
+++ b/flutter/lib/desktop/widgets/remote_menubar.dart
@@ -1157,8 +1157,9 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
             return state;
           },
           setter: (bool v) async {
-            state.value = v;
             await bind.sessionToggleOption(id: widget.id, value: opt);
+            state.value =
+                bind.sessionGetToggleOptionSync(id: widget.id, arg: opt);
           },
           padding: padding,
           dismissOnClicked: true,
diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index da711bf13..8a7a1005d 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -904,6 +904,7 @@ class CursorModel with ChangeNotifier {
   double _hoty = 0;
   double _displayOriginX = 0;
   double _displayOriginY = 0;
+  bool _firstUpdateMousePos = false;
   bool gotMouseControl = true;
   DateTime _lastPeerMouse = DateTime.now()
       .subtract(Duration(milliseconds: 2 * kMouseControlTimeoutMSec));
@@ -1121,7 +1122,11 @@ class CursorModel with ChangeNotifier {
 
   /// Update the cursor position.
   updateCursorPosition(Map<String, dynamic> evt, String id) async {
-    gotMouseControl = false;
+    if (!_firstUpdateMousePos) {
+      _firstUpdateMousePos = true;
+    } else {
+      gotMouseControl = false;
+    }
     _lastPeerMouse = DateTime.now();
     _x = double.parse(evt['x']);
     _y = double.parse(evt['y']);
diff --git a/src/client.rs b/src/client.rs
index fb42ce840..e0ac68c5d 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -1117,8 +1117,12 @@ impl LoginConfigHandler {
         } else if name == "show-quality-monitor" {
             config.show_quality_monitor.v = !config.show_quality_monitor.v;
         } else {
-            let v = self.options.get(&name).is_some();
-            if v {
+            let is_set = self
+                .options
+                .get(&name)
+                .map(|o| !o.is_empty())
+                .unwrap_or(false);
+            if is_set {
                 self.config.options.remove(&name);
             } else {
                 self.config.options.insert(name, "Y".to_owned());