diff --git a/src/Dock.Avalonia/Controls/HostWindow.axaml.cs b/src/Dock.Avalonia/Controls/HostWindow.axaml.cs
index 633ca2b7c..336387290 100644
--- a/src/Dock.Avalonia/Controls/HostWindow.axaml.cs
+++ b/src/Dock.Avalonia/Controls/HostWindow.axaml.cs
@@ -102,11 +102,6 @@ private void MoveDrag(PointerPressedEventArgs e)
         PseudoClasses.Set(":dragging", true);
         _draggingWindow = true;
         BeginMoveDrag(e);
-            
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-            EndDrag(e);
-        }
     }
 
     private void EndDrag(PointerEventArgs e)
@@ -150,9 +145,7 @@ private void HostWindow_PositionChanged(object? sender, PixelPointEventArgs e)
         {
             Window.Save();
 
-            if ((_chromeGrip is { } && _chromeGrip.IsPointerOver)
-                || (_hostWindowTitleBar?.BackgroundControl is { } && (_hostWindowTitleBar?.BackgroundControl?.IsPointerOver ?? false))
-                && _mouseDown)
+            if (_mouseDown)
             {
                 Window.Factory?.OnWindowMoveDrag(Window);
                 _hostWindowState.Process(Position.ToPoint(1.0), EventType.Moved);