diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm index 416aa12ab1..cdd6dd6c78 100644 --- a/native/Avalonia.Native/src/OSX/menu.mm +++ b/native/Avalonia.Native/src/OSX/menu.mm @@ -219,10 +219,18 @@ extern void SetAppMenu (NSString* appName, IAvnAppMenu* menu) auto currentMenu = [s_appMenuItem menu]; - [currentMenu removeItem:s_appMenuItem]; + if (currentMenu != nullptr) + { + [currentMenu removeItem:s_appMenuItem]; + } s_appMenuItem = [nativeMenu->GetNative() itemAtIndex:0]; + if (currentMenu == nullptr) + { + currentMenu = [s_appMenuItem menu]; + } + [[s_appMenuItem menu] removeItem:s_appMenuItem]; [currentMenu insertItem:s_appMenuItem atIndex:0];