diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index c2f8eb3dbf..97ec32cfb5 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -651,8 +651,8 @@ namespace Avalonia.Win32
 
                 case WindowState.FullScreen:
                     newWindowProperties.IsFullScreen = true;
-                    command = ShowWindowCommand.Maximize;
-                    break;
+                    UpdateWindowProperties(newWindowProperties);
+                    return;
 
                 default:
                     throw new ArgumentException("Invalid WindowState.");
@@ -660,11 +660,6 @@ namespace Avalonia.Win32
 
             UpdateWindowProperties(newWindowProperties);
 
-            if (newWindowProperties.IsFullScreen)
-            {
-                return;
-            }
-
             UnmanagedMethods.ShowWindow(_hwnd, command);
 
             if (state == WindowState.Maximized)