diff --git a/src/PixiEditor/Models/Controllers/MouseUpdateController.cs b/src/PixiEditor/Models/Controllers/MouseUpdateController.cs
index 2011da5da..6a5961e43 100644
--- a/src/PixiEditor/Models/Controllers/MouseUpdateController.cs
+++ b/src/PixiEditor/Models/Controllers/MouseUpdateController.cs
@@ -21,7 +21,6 @@ public MouseUpdateController(UIElement uiElement, MouseEventHandler onMouseMove)
         element = uiElement;
         
         _timer = new System.Timers.Timer(MouseUpdateIntervalMs);
-        _timer.AutoReset = true;
         _timer.Elapsed += TimerOnElapsed;
         
         element.MouseMove += OnMouseMove;
@@ -29,8 +28,10 @@ public MouseUpdateController(UIElement uiElement, MouseEventHandler onMouseMove)
 
     private void TimerOnElapsed(object sender, ElapsedEventArgs e)
     {
-        _timer.Stop();
-        element.MouseMove += OnMouseMove;
+        Application.Current?.Dispatcher.Invoke(() =>
+        {
+            element.MouseMove += OnMouseMove;
+        });
     }
 
     private void OnMouseMove(object sender, MouseEventArgs e)