diff --git a/res/cocoa/MainMenu.xib b/res/cocoa/MainMenu.xib
index b1951c40..38db0d97 100644
--- a/res/cocoa/MainMenu.xib
+++ b/res/cocoa/MainMenu.xib
@@ -7,7 +7,7 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
         <customObject id="-3" userLabel="Application"/>
-        <customObject id="-4" userLabel="Application Delegate" customClass="ApplicationDelegate"/>
+        <customObject id="-4" userLabel="Application Delegate" customClass="SSApplicationDelegate"/>
         <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
         <menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
             <items>
diff --git a/src/platform/guimac.mm b/src/platform/guimac.mm
index 19ef3ca9..d9bef7c2 100644
--- a/src/platform/guimac.mm
+++ b/src/platform/guimac.mm
@@ -367,6 +367,8 @@ MenuBarRef GetOrCreateMainMenu(bool *unique) {
     NSTextField        *editor;
 }
 
+@synthesize acceptsFirstResponder;
+
 - (id)initWithFrame:(NSRect)frameRect {
     if(self = [super initWithFrame:frameRect]) {
         self.wantsLayer = YES;
@@ -1438,7 +1440,7 @@ void OpenInBrowser(const std::string &url) {
 }
 
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender {
-    [[[NSApp mainWindow] delegate] windowShouldClose:nil];
+    [[[NSApp mainWindow] delegate] windowShouldClose:[NSApp mainWindow]];
     return NSTerminateCancel;
 }