diff --git a/Source/Editor/Gizmo/DirectionGizmo.cs b/Source/Editor/Gizmo/DirectionGizmo.cs
index ecdd19e66..b8e90f36e 100644
--- a/Source/Editor/Gizmo/DirectionGizmo.cs
+++ b/Source/Editor/Gizmo/DirectionGizmo.cs
@@ -185,17 +185,20 @@ internal class DirectionGizmo : ContainerControl
     /// <inheritdoc />
     public override bool OnMouseUp(Float2 location, MouseButton button)
     {
-        if (_mouseDown && _mouseDownLocation != location)
+        if (_mouseDown)
         {
             _mouseDown = false;
-            EndMouseCapture();
-            Root.MousePosition = PointToParent(Root, _mouseDownLocation);
-            Cursor = CursorType.Default;
-            return true;
+    
+            if (_mouseDownLocation != location)
+            {
+                _mouseDown = false;
+                EndMouseCapture();
+                Root.MousePosition = PointToParent(Root, _mouseDownLocation);
+                Cursor = CursorType.Default;
+                return true;
+            }
         }
 
-        _mouseDown = false;
-
         if (base.OnMouseUp(location, button))
             return true;