diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index d5a785c72d..d6aaa2450a 100644
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -232,26 +232,25 @@ public :
     
     virtual NSMenu* MacCreateOrFindWindowMenu()
     {
-        wxMenu* peer = GetWXPeer();
-        wxString windowMenuTitle = wxStripMenuCodes(_("&Window"));
-        
+        NSString* nsWindowMenuTitle = wxNSStringWithWxString(wxStripMenuCodes(wxApp::s_macWindowMenuTitleName));
+        NSString* nsAlternateWindowMenuTitle = wxNSStringWithWxString(wxStripMenuCodes(_("&Window")));
+
         NSMenu* windowMenu = nil;
-        int windowmenuid = peer->FindItem(wxApp::s_macWindowMenuTitleName);
-        if ( windowmenuid == wxNOT_FOUND )
-            windowmenuid = peer->FindItem(_("&Window"));
-        
-        if ( windowmenuid != wxNOT_FOUND )
+
+        for (NSMenuItem* topmenu in [m_osxMenu itemArray])
         {
-            wxMenuItem* windowMenuItem = peer->FindItem(windowmenuid);
-            
-            if ( windowMenuItem->IsSubMenu() )
-                windowMenu = windowMenuItem->GetSubMenu()->GetHMenu();
+            if ([[topmenu title] isEqualToString:nsWindowMenuTitle] ||
+                [[topmenu title] isEqualToString:nsAlternateWindowMenuTitle])
+            {
+                windowMenu = [topmenu submenu];
+                break;
+            }
         }
 
         if ( windowMenu == nil )
         {
-            windowMenu = [[NSMenu alloc] initWithTitle:wxNSStringWithWxString(windowMenuTitle)];
-            NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(windowMenuTitle) action:nil keyEquivalent:@""];
+            windowMenu = [[NSMenu alloc] initWithTitle:nsWindowMenuTitle];
+            NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:nsWindowMenuTitle action:nil keyEquivalent:@""];
             [windowMenuItem setSubmenu:windowMenu];
             [windowMenu release];
             [m_osxMenu addItem:windowMenuItem];
@@ -265,31 +264,27 @@ public :
         {
             NSMenu* windowMenu = MacCreateOrFindWindowMenu();
             NSMenuItem* item = nil;
-            bool menuWasEmpty = [windowMenu numberOfItems] == 0;
-            if ( !menuWasEmpty )
-                item = [windowMenu itemAtIndex:0];
-            
-            if ( item == nil || [item action] != @selector(performMiniaturize:) )
-            {
-                item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Minimize")) action:@selector(performMiniaturize:) keyEquivalent:@"m"];
-                [windowMenu insertItem:item atIndex:0];
-                [item setEnabled:YES];
-                [item release];
-                
-                item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Zoom")) action:@selector(performZoom:) keyEquivalent:@""];
-                [windowMenu insertItem:item atIndex:1];
-                [item release];
-                
-                [windowMenu insertItem:[NSMenuItem separatorItem] atIndex:2];
-                
-                item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Bring All to Front")) action:@selector(arrangeInFront:) keyEquivalent:@""];
-                [windowMenu insertItem:item atIndex:3];
-                [item release];
-                
-                if ( !menuWasEmpty )
-                    [windowMenu insertItem:[NSMenuItem separatorItem] atIndex:4];
-            }
-            
+
+            // all items have to be removed to prevent that multiple identical menu items
+            // exist because NSApp.setWindowsMenu will add some stuff regardless if it
+            // already exists or not
+            [windowMenu removeAllItems];
+
+            item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Minimize")) action:@selector(performMiniaturize:) keyEquivalent:@"m"];
+            [windowMenu insertItem:item atIndex:0];
+            [item setEnabled:YES];
+            [item release];
+
+            item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Zoom")) action:@selector(performZoom:) keyEquivalent:@""];
+            [windowMenu insertItem:item atIndex:1];
+            [item release];
+
+            [windowMenu insertItem:[NSMenuItem separatorItem] atIndex:2];
+
+            item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Bring All to Front")) action:@selector(arrangeInFront:) keyEquivalent:@""];
+            [windowMenu insertItem:item atIndex:3];
+            [item release];
+
             [NSApp setWindowsMenu:windowMenu];
         }
     }