diff --git a/CMakeLists.txt b/CMakeLists.txt
index d78b82e2c4..bd25bf4118 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1645,8 +1645,8 @@ if(NOT LIBRETRO)
 
 			target_sources(${PROJECT_NAME} PRIVATE
 					shell/apple/common/http_client.mm
-					shell/apple/emulator-osx/emulator-osx/SDLMain.h
-					shell/apple/emulator-osx/emulator-osx/SDLMain.mm
+					shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.h
+					shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.mm
 					shell/apple/emulator-osx/emulator-osx/osx-main.mm)
 			set(ASSETS shell/apple/emulator-osx/emulator-osx/Images.xcassets)
 			target_sources(${PROJECT_NAME} PRIVATE ${ASSETS})
diff --git a/shell/apple/emulator-osx/MacOSXBundleInfo.plist.in b/shell/apple/emulator-osx/MacOSXBundleInfo.plist.in
index d6c384b053..2b700acc6d 100644
--- a/shell/apple/emulator-osx/MacOSXBundleInfo.plist.in
+++ b/shell/apple/emulator-osx/MacOSXBundleInfo.plist.in
@@ -2,6 +2,22 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>chd</string>
+				<string>gdi</string>
+				<string>cdi</string>
+				<string>cue</string>
+				<string>zip</string>
+				<string>7z</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
diff --git a/shell/apple/emulator-osx/emulator-osx/SDLMain.h b/shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.h
similarity index 83%
rename from shell/apple/emulator-osx/emulator-osx/SDLMain.h
rename to shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.h
index c908cafa4b..634c96b7e8 100644
--- a/shell/apple/emulator-osx/emulator-osx/SDLMain.h
+++ b/shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.h
@@ -9,7 +9,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface SDLMain : NSObject <NSApplicationDelegate>
+@interface SDLApplicationDelegate : NSObject <NSApplicationDelegate>
 @end
 
 #endif /* _SDLMain_h_ */
diff --git a/shell/apple/emulator-osx/emulator-osx/SDLMain.mm b/shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.mm
similarity index 85%
rename from shell/apple/emulator-osx/emulator-osx/SDLMain.mm
rename to shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.mm
index 3b8912229b..6ed08f8633 100644
--- a/shell/apple/emulator-osx/emulator-osx/SDLMain.mm
+++ b/shell/apple/emulator-osx/emulator-osx/SDLApplicationDelegate.mm
@@ -5,7 +5,8 @@
  Feel free to customize this file to suit your needs
  */
 #include <SDL.h>
-#include "SDLMain.h"
+#include "SDLApplicationDelegate.h"
+#include "emulator.h"
 #include <sys/param.h> /* for MAXPATHLEN */
 #include <unistd.h>
 #include "rend/gui.h"
@@ -39,11 +40,6 @@ - (void)setAppleMenu:(NSMenu *)menu;
 }
 #endif /* SDL_USE_CPS */
 
-static int    gArgc;
-static char  **gArgv;
-static BOOL   gFinderLaunch;
-static BOOL   gCalledAppMainline = FALSE;
-
 static NSString *getApplicationName(void)
 {
     const NSDictionary *dict;
@@ -127,21 +123,14 @@ - (void)selectAllAction:(id)sender
 @end
 
 /* The main class of the application, the application's delegate */
-@implementation SDLMain
+@implementation SDLApplicationDelegate
 
 /* Set the working directory to the .app's parent directory */
-- (void) setupWorkingDirectory:(BOOL)shouldChdir
+- (void) setupWorkingDirectory
 {
-    if (shouldChdir)
+	if([[NSProcessInfo processInfo] environment][@"PWD"] == NULL && [[[NSFileManager defaultManager] currentDirectoryPath] isEqualToString:@"/"])
     {
-        char parentdir[MAXPATHLEN];
-        CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-        CFURLRef url2 = CFURLCreateCopyDeletingLastPathComponent(0, url);
-        if (CFURLGetFileSystemRepresentation(url2, 1, (UInt8 *)parentdir, MAXPATHLEN)) {
-            chdir(parentdir);   /* chdir to the binary app's parent */
-        }
-        CFRelease(url);
-        CFRelease(url2);
+		chdir([[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] cStringUsingEncoding:NSUTF8StringEncoding]);
     }
 }
 
@@ -274,7 +263,7 @@ static void setupHelpMenu(void)
 static void CustomApplicationMain (int argc, char **argv)
 {
     NSAutoreleasePool    *pool = [[NSAutoreleasePool alloc] init];
-    SDLMain                *sdlMain;
+    SDLApplicationDelegate                *appDelegate;
 
     /* Ensure the application object is initialised */
     [NSApplication sharedApplication];
@@ -297,13 +286,13 @@ static void CustomApplicationMain (int argc, char **argv)
     setupHelpMenu(); /* needed for help menu */
     
     /* Create SDLMain and make it the app delegate */
-    sdlMain = [[SDLMain alloc] init];
-    [NSApp setDelegate:sdlMain];
+    appDelegate = [[SDLApplicationDelegate alloc] init];
+    [NSApp setDelegate:appDelegate];
     
     /* Start the main event loop */
     [NSApp run];
     
-    [sdlMain release];
+    [appDelegate release];
     [pool release];
 }
 
@@ -338,34 +327,13 @@ static bool dumpCallback(const char *dump_dir, const char *minidump_id, void *co
  */
 - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
 {
-    const char *temparg;
-    size_t arglen;
-    char *arg;
-    char **newargv;
-    
-    if (!gFinderLaunch)  /* MacOS is passing command line args. */
-        return FALSE;
-    
-    if (gCalledAppMainline)  /* app has started, ignore this document. */
-        return FALSE;
-    
-    temparg = [filename UTF8String];
-    arglen = SDL_strlen(temparg) + 1;
-    arg = (char *) SDL_malloc(arglen);
-    if (arg == NULL)
-        return FALSE;
-    
-    newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2));
-    if (newargv == NULL)
-    {
-        SDL_free(arg);
-        return FALSE;
-    }
-    gArgv = newargv;
-    
-    SDL_strlcpy(arg, temparg, arglen);
-    gArgv[gArgc++] = arg;
-    gArgv[gArgc] = NULL;
+	if(emu.running())
+		gui_stop_game();
+	
+	dispatch_async(dispatch_get_main_queue(), ^(){
+		gui_start_game([filename cStringUsingEncoding:NSUTF8StringEncoding]);
+	});
+
     return TRUE;
 }
 
@@ -381,11 +349,9 @@ - (void) applicationDidFinishLaunching: (NSNotification *) note
     int status;
     
     /* Set the working directory to the .app's parent directory */
-    [self setupWorkingDirectory:gFinderLaunch];
+    [self setupWorkingDirectory];
     
-    /* Hand off to main application code */
-    gCalledAppMainline = TRUE;
-    status = SDL_main (gArgc, gArgv);
+    status = SDL_main(NULL, NULL);
     
     /* We're done, thank you for playing */
     exit(status);
@@ -456,23 +422,6 @@ - (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString
 /* Main entry point to executable - should *not* be SDL_main! */
 int main (int argc, char **argv)
 {
-    /* Copy the arguments into a global variable */
-    /* This is passed if we are launched by double-clicking */
-    if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
-        gArgv = (char **) SDL_malloc(sizeof (char *) * 2);
-        gArgv[0] = argv[0];
-        gArgv[1] = NULL;
-        gArgc = 1;
-        gFinderLaunch = YES;
-    } else {
-        int i;
-        gArgc = argc;
-        gArgv = (char **) SDL_malloc(sizeof (char *) * (argc+1));
-        for (i = 0; i <= argc; i++)
-            gArgv[i] = argv[i];
-        gFinderLaunch = NO;
-    }
-    
     if (getppid() != 1) {
         /* Make LLDB ignore EXC_BAD_ACCESS for debugging */
         task_set_exception_ports(mach_task_self(), EXC_MASK_BAD_ACCESS, MACH_PORT_NULL, EXCEPTION_DEFAULT, 0);