diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index 4b64eabc26..a5c9c9c3c3 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -759,6 +759,16 @@ namespace Avalonia.Win32
                 _extendedMargins = new Thickness();
             }
 
+            if(_extendChromeHints.HasFlag(ExtendClientAreaChromeHints.SystemChrome) &&
+                !_extendChromeHints.HasFlag(ExtendClientAreaChromeHints.PreferSystemChrome))
+            {
+                EnableCloseButton(_hwnd);
+            }
+            else
+            {
+                DisableCloseButton(_hwnd);
+            }
+
             ExtendClientAreaToDecorationsChanged?.Invoke(_isClientAreaExtended);
         }