diff --git a/.vscode/settings.json b/.vscode/settings.json
index ee551d7617..e90ca77e4a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -12,7 +12,6 @@
    "files.associations": {
       "frontend_driver.h": "c",
       "*.in": "c",
-      "*.rh": "c",
-      "menu_driver.h": "c"
+      "*.rh": "c"
    },
 }
\ No newline at end of file
diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
index 2fe5708977..1cbf32f46f 100644
--- a/intl/msg_hash_lbl.h
+++ b/intl/msg_hash_lbl.h
@@ -363,6 +363,8 @@ MSG_HASH(MENU_ENUM_LABEL_DISK_IMAGE_APPEND,
       "disk_image_append")
 MSG_HASH(MENU_ENUM_LABEL_SUBSYSTEM_ADD,
       "subsystem_add")
+MSG_HASH(MENU_ENUM_LABEL_SUBSYSTEM_LOAD,
+      "subsystem_load")
 MSG_HASH(MENU_ENUM_LABEL_DISK_OPTIONS,
       "core_disk_options")
 MSG_HASH(MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST,
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index b9bae967e2..61f5211668 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -456,6 +456,10 @@ int generic_action_ok_displaylist_push(const char *path,
          info_label         = label;
          dl_type            = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
          break;
+      case ACTION_OK_DL_SUBSYSTEM_LOAD:
+         filebrowser_clear_type();
+         RARCH_LOG("LOADING!!!!!!!\n");
+         break;
       case ACTION_OK_DL_CHEAT_FILE:
          filebrowser_clear_type();
          info.type          = type;
@@ -2991,6 +2995,7 @@ default_action_ok_func(action_ok_cheat_file, ACTION_OK_DL_CHEAT_FILE)
 default_action_ok_func(action_ok_playlist_collection, ACTION_OK_DL_PLAYLIST_COLLECTION)
 default_action_ok_func(action_ok_disk_image_append_list, ACTION_OK_DL_DISK_IMAGE_APPEND_LIST)
 default_action_ok_func(action_ok_subsystem_add_list, ACTION_OK_DL_SUBSYSTEM_ADD_LIST)
+default_action_ok_func(action_ok_subsystem_add_load, ACTION_OK_DL_SUBSYSTEM_LOAD)
 default_action_ok_func(action_ok_record_configfile, ACTION_OK_DL_RECORD_CONFIGFILE)
 default_action_ok_func(action_ok_remap_file, ACTION_OK_DL_REMAP_FILE)
 default_action_ok_func(action_ok_shader_preset, ACTION_OK_DL_SHADER_PRESET)
@@ -4110,6 +4115,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_SUBSYSTEM_ADD:
             BIND_ACTION_OK(cbs, action_ok_subsystem_add_list);
             break;
+         case MENU_ENUM_LABEL_SUBSYSTEM_LOAD:
+            BIND_ACTION_OK(cbs, action_ok_subsystem_add_load);
+            break;
          case MENU_ENUM_LABEL_CONFIGURATIONS:
             BIND_ACTION_OK(cbs, action_ok_configurations_list);
             break;
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 9b85bbc773..7852ef827f 100755
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -4462,9 +4462,9 @@ static int xmb_list_push(void *data, void *userdata,
                            snprintf(s, sizeof(s), "Start %s %c", subsystem->desc, i == pending_subsystem ? '*': ' ');
                            menu_entries_append_enum(info->list,
                                  s,
-                                 msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_ADD),
-                                 MENU_ENUM_LABEL_SUBSYSTEM_ADD,
-                                 MENU_SETTINGS_SUBSYSTEM_ADD + i, 0, 0);
+                                 msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_LOAD),
+                                 MENU_ENUM_LABEL_SUBSYSTEM_LOAD,
+                                 MENU_SETTINGS_SUBSYSTEM_LOAD, 0, 0);
                         }
                      }
                      else
@@ -4474,7 +4474,7 @@ static int xmb_list_push(void *data, void *userdata,
                               s,
                               msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_ADD),
                               MENU_ENUM_LABEL_SUBSYSTEM_ADD,
-                              MENU_SETTINGS_SUBSYSTEM_ADD + i, 0, 0);
+                              MENU_SETTINGS_SUBSYSTEM_ADD, 0, 0);
                      }
                   }
                }
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index befc9c9a18..8aeac420f3 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -85,6 +85,7 @@ enum
    ACTION_OK_DL_RECORD_CONFIGFILE,
    ACTION_OK_DL_DISK_IMAGE_APPEND_LIST,
    ACTION_OK_DL_SUBSYSTEM_ADD_LIST,
+   ACTION_OK_DL_SUBSYSTEM_LOAD,
    ACTION_OK_DL_PLAYLIST_COLLECTION,
    ACTION_OK_DL_CONTENT_COLLECTION_LIST,
    ACTION_OK_DL_CHEAT_FILE,
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 00d04dcdd3..52610af733 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -209,6 +209,8 @@ enum menu_settings_type
    MENU_SETTINGS_INPUT_DESC_KBD_BEGIN,
    MENU_SETTINGS_INPUT_DESC_KBD_END = MENU_SETTINGS_INPUT_DESC_KBD_BEGIN + 135,
 
+   MENU_SETTINGS_SUBSYSTEM_LOAD,
+
    MENU_SETTINGS_SUBSYSTEM_ADD,
    MENU_SETTINGS_SUBSYSTEM_LAST = MENU_SETTINGS_SUBSYSTEM_ADD + RARCH_MAX_SUBSYSTEMS,
 
diff --git a/msg_hash.h b/msg_hash.h
index 6856a60f48..a989f98fcb 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1386,6 +1386,7 @@ enum msg_hash_enums
    MENU_LABEL(REBOOT),
    MENU_LABEL(DISK_IMAGE_APPEND),
    MENU_LABEL(SUBSYSTEM_ADD),
+   MENU_LABEL(SUBSYSTEM_LOAD),
    MENU_LABEL(CORE_LIST),
    MENU_LABEL(MANAGEMENT),
    MENU_LABEL(ONLINE),