diff --git a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
index d886b67241..8a340aac5e 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
@@ -117,7 +117,7 @@ namespace Avalonia.Win32
                             {
                                 var visual = window.Renderer.HitTestFirst(position, _owner as Window, x =>
                                 {
-                                    if (x is IInputElement ie && !ie.IsHitTestVisible)
+                                    if (x is IInputElement ie && (!ie.IsHitTestVisible || !ie.IsVisible))
                                     {
                                         return false;
                                     }