diff --git a/apple/RetroArch/RetroArch_Apple.h b/apple/RetroArch/RetroArch_Apple.h
index 651a58ef6e..a40344509f 100644
--- a/apple/RetroArch/RetroArch_Apple.h
+++ b/apple/RetroArch/RetroArch_Apple.h
@@ -67,6 +67,10 @@ void apple_run_core(RAModuleInfo* core, const char* file);
 @end
 
 @interface RetroArch_OSX : NSObject<RetroArch_Platform, NSApplicationDelegate>
+{
+@public
+   NSWindow IBOutlet *window;
+}
 
 + (RetroArch_OSX*)get;
 
diff --git a/apple/RetroArch/main.m b/apple/RetroArch/main.m
index 26eca01877..93eceef101 100644
--- a/apple/RetroArch/main.m
+++ b/apple/RetroArch/main.m
@@ -474,10 +474,6 @@ int main(int argc, char *argv[])
 #ifdef OSX
 
 @implementation RetroArch_OSX
-{
-   NSWindow IBOutlet *window;
-}
-
 + (RetroArch_OSX*)get
 {
    return (RetroArch_OSX*)[[NSApplication sharedApplication] delegate];
@@ -487,6 +483,9 @@ int main(int argc, char *argv[])
 {
    apple_platform = self;
 
+   if (!apple_is_running)
+      [self openDocument:nil];
+
    [window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
 
    window.backgroundColor = [NSColor blackColor];
diff --git a/apple/RetroArch/utility.m b/apple/RetroArch/utility.m
index a56806e69a..17d5c2aaab 100644
--- a/apple/RetroArch/utility.m
+++ b/apple/RetroArch/utility.m
@@ -34,7 +34,7 @@ void apple_display_alert(NSString* message, NSString* title)
    alert.messageText = title ? title : @"RetroArch";
    alert.informativeText = message;
    alert.alertStyle = NSInformationalAlertStyle;
-   [alert beginSheetModalForWindow:NSApplication.sharedApplication.mainWindow
+   [alert beginSheetModalForWindow:RetroArch_OSX.get->window
           modalDelegate:nil
           didEndSelector:nil
           contextInfo:nil];