diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index f8dc07063e..091219fc72 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -772,9 +772,10 @@ private:
                         {
                             ExitFullScreenMode();
                         }
-                        
-                        
-                        [Window miniaturize:Window];
+                        else
+                        {
+                            [Window miniaturize:Window];
+                        }
                         break;
                         
                     case FullScreen:
@@ -1604,6 +1605,11 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
             [self setFrame:screenRect display:YES];
         }
         
+        if(parent->WindowState() == Minimized)
+        {
+            [self miniaturize:nullptr];
+        }
+        
         parent->WindowStateChanged();
     }
 }