diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index db42fca251..92564d296d 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -1472,13 +1472,6 @@ namespace Avalonia.Win32
                 {
                     case WindowDecorations.Full:
                         style |= WindowStyles.WS_BORDER | WindowStyles.WS_CAPTION | WindowStyles.WS_SYSMENU;
-
-                        if (newProperties.IsMinimizable)
-                            style |= WindowStyles.WS_MINIMIZEBOX;
-
-                        if (newProperties.IsMaximizable || (newProperties.WindowState == WindowState.Maximized && newProperties.IsResizable))
-                            style |= WindowStyles.WS_MAXIMIZEBOX;
-
                         break;
 
                     case WindowDecorations.BorderOnly:
@@ -1486,6 +1479,12 @@ namespace Avalonia.Win32
                         break;
                 }
 
+                if (newProperties.IsMinimizable)
+                    style |= WindowStyles.WS_MINIMIZEBOX;
+
+                if (newProperties.IsMaximizable || (newProperties.WindowState == WindowState.Maximized && newProperties.IsResizable))
+                    style |= WindowStyles.WS_MAXIMIZEBOX;
+
                 if (newProperties.Decorations != WindowDecorations.None && newProperties.IsResizable)
                     style |= WindowStyles.WS_THICKFRAME;