diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 2ae200a179..9d35342fb9 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -621,7 +621,7 @@ namespace Avalonia.Win32
                         timestamp,
                         _owner,
                         RawPointerEventType.LeaveWindow,
-                        new Point(), WindowsKeyboardDevice.Instance.Modifiers);
+                        new Point(-1,-1), WindowsKeyboardDevice.Instance.Modifiers);
                     break;
 
                 case UnmanagedMethods.WindowsMessage.WM_NCLBUTTONDOWN:
@@ -636,7 +636,7 @@ namespace Avalonia.Win32
                             : msg == (int)UnmanagedMethods.WindowsMessage.WM_NCRBUTTONDOWN
                                 ? RawPointerEventType.RightButtonDown
                                 : RawPointerEventType.MiddleButtonDown,
-                        new Point(0, 0), GetMouseModifiers(wParam));
+                        PointToClient(PointFromLParam(lParam)), GetMouseModifiers(wParam));
                     break;
                 case WindowsMessage.WM_TOUCH:
                     var touchInputCount = wParam.ToInt32();