diff --git a/src/config/os/macosx/macosx.mm b/src/config/os/macosx/macosx.mm
index 24d5879..19f37b0 100644
--- a/src/config/os/macosx/macosx.mm
+++ b/src/config/os/macosx/macosx.mm
@@ -29,5 +29,18 @@ void macosx_hide_menu_bar(int mouseY)
             | NSApplicationPresentationAutoHideDock];
         dock = true;
     }
+
+    if(!inited)
+    {
+        // Zap keyboard equivalents in the application menu.
+        // Emulated mac apps are used to owning Command-H,
+        // and they really need to handle Command-Q.
+        NSMenuItem *menutitle = [[NSApp mainMenu] itemAtIndex: 0];
+        NSMenu *menu = [menutitle submenu];
+        for(NSMenuItem *item in [menu itemArray])
+        {
+            item.keyEquivalent = @"";
+        }
+    }
     inited = true;
 }