diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index 0016b8dfc3..50e04d9def 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -668,7 +668,7 @@ private:
                 return E_POINTER;
             }
             
-            if(([Window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask)
+            if(([Window styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen)
             {
                 *ret = FullScreen;
                 return S_OK;
@@ -701,6 +701,8 @@ private:
         [Window setTitlebarAppearsTransparent:NO];
         [Window setTitle:_lastTitle];
         
+        [Window setStyleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskResizable];
+        
         [Window toggleFullScreen:nullptr];
     }