diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
index 19065097fb..d52518820c 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.h
@@ -37,6 +37,7 @@ BEGIN_INTERFACE_MAP()
     NSSize lastSize;
     NSSize lastMinSize;
     NSSize lastMaxSize;
+    AvnMenu* lastMenu;
     NSString *_lastTitle;
 
     bool _shown;
diff --git a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
index 82c634dc4f..bd763ce2fd 100644
--- a/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowBaseImpl.mm
@@ -34,6 +34,7 @@ WindowBaseImpl::WindowBaseImpl(IAvnWindowBaseEvents *events, IAvnGlContext *gl)
     _lastTitle = @"";
 
     Window = nullptr;
+    lastMenu = nullptr;
 }
 
 HRESULT WindowBaseImpl::ObtainNSViewHandle(void **ret) {
@@ -91,6 +92,10 @@ HRESULT WindowBaseImpl::Show(bool activate, bool isDialog) {
 
         [Window setTitle:_lastTitle];
 
+        if(!isDialog) {
+            [GetWindowProtocol() setCanBecomeKeyAndMain];
+        }
+
         if (ShouldTakeFocusOnShow() && activate) {
             [Window orderFront:Window];
             [Window makeKeyAndOrderFront:Window];
@@ -306,12 +311,14 @@ HRESULT WindowBaseImpl::SetMainMenu(IAvnMenu *menu) {
 
     auto nativeMenu = dynamic_cast<AvnAppMenu *>(menu);
 
-    auto nsmenu = nativeMenu->GetNative();
+    lastMenu = nativeMenu->GetNative();
 
-    [GetWindowProtocol() applyMenu:nsmenu];
+    if(Window != nullptr) {
+        [GetWindowProtocol() applyMenu:lastMenu];
 
-    if ([Window isKeyWindow]) {
-        [GetWindowProtocol() showWindowMenuWithAppMenu];
+        if ([Window isKeyWindow]) {
+            [GetWindowProtocol() showWindowMenuWithAppMenu];
+        }
     }
 
     return S_OK;
@@ -524,17 +531,30 @@ void WindowBaseImpl::InitialiseNSWindow() {
         [Window setStyleMask:NSWindowStyleMaskBorderless];
         [Window setBackingType:NSBackingStoreBuffered];
 
-        [Window setContentSize: lastSize];
+        [Window setContentSize:lastSize];
         [Window setContentMinSize:lastMinSize];
         [Window setContentMaxSize:lastMaxSize];
 
         [Window setOpaque:false];
 
-        [Window setContentMinSize: lastMinSize];
-        [Window setContentMaxSize: lastMaxSize];
+        [Window setContentMinSize:lastMinSize];
+        [Window setContentMaxSize:lastMaxSize];
+
+        if (lastMenu != nullptr) {
+            [GetWindowProtocol() applyMenu:lastMenu];
+
+            if ([Window isKeyWindow]) {
+                [GetWindowProtocol() showWindowMenuWithAppMenu];
+            }
+        }
     }
 }
 
 id <AvnWindowProtocol> WindowBaseImpl::GetWindowProtocol() {
-    return static_cast<id <AvnWindowProtocol>>(Window);
+    id instance;
+    if ([Window conformsToProtocol:@protocol(AvnWindowProtocol)]) {
+        instance = Window;
+    }
+
+    return instance;
 }
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index 3de4f5d5a8..2a25cc69da 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -20,7 +20,6 @@ WindowImpl::WindowImpl(IAvnWindowEvents *events, IAvnGlContext *gl) : WindowBase
     _lastWindowState = Normal;
     _actualWindowState = Normal;
     WindowEvents = events;
-    [GetWindowProtocol() setCanBecomeKeyAndMain];
     [Window disableCursorRects];
     [Window setTabbingMode:NSWindowTabbingModeDisallowed];
     [Window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];