diff --git a/command_event.c b/command_event.c
index 2b215f1f88..f724535f78 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1376,7 +1376,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
          rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
          break;
       case EVENT_CMD_RESTART_RETROARCH:
-         if (!frontend_driver_set_fork(FRONTEND_FORK_SALAMANDER_RESTART))
+         if (!frontend_driver_set_fork(FRONTEND_FORK_RESTART))
             return false;
          break;
       case EVENT_CMD_MENU_SAVE_CURRENT_CONFIG:
diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index c98ec66e60..d32d5ed04e 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -340,7 +340,7 @@ static void frontend_gx_exitspawn(char *s, size_t len)
       case FRONTEND_FORK_CORE_WITH_ARGS:
          should_load_game = true;
          break;
-      case FRONTEND_FORK_SALAMANDER_RESTART:
+      case FRONTEND_FORK_RESTART:
          {
             char new_path[PATH_MAX_LENGTH];
             char salamander_name[PATH_MAX_LENGTH];
@@ -402,17 +402,17 @@ static bool frontend_gx_set_fork(enum frontend_fork fork_mode)
    {
       case FRONTEND_FORK_CORE:
          RARCH_LOG("FRONTEND_FORK_CORE\n");
-         gx_fork_mode  = fork_mode;
+         /* NOTE: We implement Salamander, so just turn
+          * this into FRONTEND_FORK_RESTART. */
+         gx_fork_mode  = FRONTEND_FORK_RESTART;
          break;
       case FRONTEND_FORK_CORE_WITH_ARGS:
          RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          gx_fork_mode  = fork_mode;
          break;
-      case FRONTEND_FORK_SALAMANDER_RESTART:
-         RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n");
-         /* NOTE: We don't implement Salamander, so just turn
-          * this into FRONTEND_FORK_CORE. */
-         gx_fork_mode  = FRONTEND_FORK_CORE;
+      case FRONTEND_FORK_RESTART:
+         RARCH_LOG("FRONTEND_FORK_RESTART\n");
+         gx_fork_mode  = fork_mode;
          break;
       case FRONTEND_FORK_NONE:
       default:
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index ef4c3c59b4..98a677dbea 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -2157,8 +2157,8 @@ static bool frontend_linux_set_fork(enum frontend_fork fork_mode)
          RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          linux_fork_mode  = fork_mode;
          break;
-      case FRONTEND_FORK_SALAMANDER_RESTART:
-         RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n");
+      case FRONTEND_FORK_RESTART:
+         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          /* NOTE: We don't implement Salamander, so just turn
           * this into FRONTEND_FORK_CORE. */
          linux_fork_mode  = FRONTEND_FORK_CORE;
diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index 1332682079..e8ddd7b032 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -339,8 +339,8 @@ static bool frontend_ps3_set_fork(enum frontend_fork fork_mode)
          RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          ps3_fork_mode  = fork_mode;
          break;
-      case FRONTEND_FORK_SALAMANDER_RESTART:
-         RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n");
+      case FRONTEND_FORK_RESTART:
+         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          /* NOTE: We don't implement Salamander, so just turn
           * this into FRONTEND_FORK_CORE. */
          ps3_fork_mode  = FRONTEND_FORK_CORE;
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index cc3752322c..d7c6f4c371 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -281,8 +281,8 @@ static bool frontend_psp_set_fork(enum frontend_fork fork_mode)
          RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          psp_fork_mode  = fork_mode;
          break;
-      case FRONTEND_FORK_SALAMANDER_RESTART:
-         RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n");
+      case FRONTEND_FORK_RESTART:
+         RARCH_LOG("FRONTEND_FORK_RESTART\n");
          /* NOTE: We don't implement Salamander, so just turn
           * this into FRONTEND_FORK_CORE. */
          psp_fork_mode  = FRONTEND_FORK_CORE;
diff --git a/frontend/drivers/platform_xdk.cpp b/frontend/drivers/platform_xdk.cpp
index 181344a937..3187fc2b5f 100644
--- a/frontend/drivers/platform_xdk.cpp
+++ b/frontend/drivers/platform_xdk.cpp
@@ -1304,7 +1304,7 @@ static bool frontend_xdk_set_fork(enum frontend_fork fork_mode)
          RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
          xdk_fork_mode  = fork_mode;
          break;
-      case FRONTEND_FORK_SALAMANDER_RESTART:
+      case FRONTEND_FORK_RESTART:
          RARCH_LOG("FRONTEND_FORK_SALAMANDER_RESTART\n");
          /* NOTE: We don't implement Salamander, so just turn
           * this into FRONTEND_FORK_CORE. */
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index 4e1c4ce970..9f0208a786 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -45,7 +45,7 @@ enum frontend_fork
    FRONTEND_FORK_NONE = 0,
    FRONTEND_FORK_CORE,
    FRONTEND_FORK_CORE_WITH_ARGS,
-   FRONTEND_FORK_SALAMANDER_RESTART
+   FRONTEND_FORK_RESTART
 };
 
 enum frontend_architecture
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index a9fce8b0d1..8f6a84a99e 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -768,9 +768,7 @@ static int generic_action_ok(const char *path,
          if (event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL))
          {
 #ifndef HAVE_DYNAMIC
-            /* Core selection on non-console just updates directory listing.
-             * Will take effect on new content load. */
-            if (event_cmd_ctl(EVENT_CMD_RESTART_RETROARCH, NULL))
+            if (frontend_driver_set_fork(FRONTEND_FORK_CORE))
                ret = -1;
 #endif
          }