diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index d32d2be1a6..e49eb5be9f 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -619,6 +619,14 @@ namespace Avalonia.Win32
                         new Point(0, 0), GetMouseModifiers(wParam));
                     break;
 
+                case WindowsMessage.WM_NCPAINT:
+                case WindowsMessage.WM_NCACTIVATE:
+                    if (!_decorated)
+                    {
+                        return IntPtr.Zero;
+                    }
+                    break;
+
                 case UnmanagedMethods.WindowsMessage.WM_PAINT:
                     UnmanagedMethods.PAINTSTRUCT ps;
                     if (UnmanagedMethods.BeginPaint(_hwnd, out ps) != IntPtr.Zero)