diff --git a/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
index 001fa042c3..6e825de23a 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
@@ -138,8 +138,16 @@ namespace Avalonia.Win32
                         if (((HitTestValues)lRet) == HitTestValues.HTCAPTION)
                         {
                             var position = PointToClient(PointFromLParam(lParam));
-
-                            var visual = (_owner as Window).Renderer.HitTestFirst(position, _owner as Window, null);
+                            
+                            var visual = (_owner as Window).Renderer.HitTestFirst(position, _owner as Window, x =>
+                            {
+                                if(x is IInputElement ie && !ie.IsHitTestVisible)
+                                {
+                                    return false;
+                                }
+
+                                return true;
+                            });
 
                             if(visual != null)
                             {