diff --git a/command_event.c b/command_event.c
index 76d61fbc2a..7178ca9c1a 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1314,14 +1314,7 @@ bool event_command(enum event_command cmd)
          rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
          break;
       case EVENT_CMD_RESTART_RETROARCH:
-         {
-#if defined(GEKKO) && defined(HW_RVL)
-            char new_path[PATH_MAX_LENGTH];
-            fill_pathname_join(new_path, g_defaults.dir.core, SALAMANDER_FILE, sizeof(new_path));
-            runloop_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, new_path);
-#endif
-            frontend_driver_set_fork(true, false);
-         }
+         frontend_driver_set_fork(true, false);
          break;
       case EVENT_CMD_MENU_SAVE_CURRENT_CONFIG:
          event_save_current_config();
diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index 42479214b1..7bce3c4438 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -366,8 +366,18 @@ static void frontend_gx_process_args(int *argc, char *argv[])
 
 static void frontend_gx_set_fork(bool exitspawn, bool start_game)
 {
-   exit_spawn = exitspawn;
+#if defined(HW_RVL) && !defined(IS_SALAMANDER)
+   char new_path[PATH_MAX_LENGTH];
+   fill_pathname_join(new_path, g_defaults.dir.core, SALAMANDER_FILE, sizeof(new_path));
+   runloop_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, new_path);
+#endif
+
+   exit_spawn           = exitspawn;
    exitspawn_start_game = start_game;
+
+#ifndef IS_SALAMANDER
+   rarch_ctl(RARCH_CTL_FORCE_QUIT, NULL);
+#endif
 }
 
 static int frontend_gx_get_rating(void)