diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c
index a4f6f9a556..aaed036b05 100644
--- a/frontend/frontend_console.c
+++ b/frontend/frontend_console.c
@@ -115,10 +115,10 @@ int rarch_main(int argc, char *argv[])
    char core_exe_path[256];
    snprintf(core_exe_path, sizeof(core_exe_path), "%sCORE%s", path_prefix, DEFAULT_EXE_EXT);
 
-   // Save new libretro core path to config file
+   // Save new libretro core path to config file and exit
    if (path_file_exists(core_exe_path))
       if (libretro_install_core(path_prefix, core_exe_path))
-         config_save_file(g_extern.config_path);
+	 g_extern.system.shutdown = true;
 #endif
 
 #ifdef GEKKO
diff --git a/frontend/platform/platform_xdk_exec.c b/frontend/platform/platform_xdk_exec.c
index 91e94d8068..9ba2b77be6 100644
--- a/frontend/platform/platform_xdk_exec.c
+++ b/frontend/platform/platform_xdk_exec.c
@@ -36,7 +36,8 @@ static void rarch_console_exec(const char *path, bool should_load_game)
       snprintf((char*)ptr.Data, sizeof(ptr.Data), "%s", g_extern.fullpath);
       XLaunchNewImage(path, &ptr);
    }
-   XLaunchNewImage(path, NULL);
+   else
+      XLaunchNewImage(path, NULL);
 #else
    XLaunchNewImage(path, NULL);
 #endif