diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 435dfbb55b..eb94c82740 100755
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -4500,7 +4500,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, 0, 0);
+                              MENU_SETTINGS_SUBSYSTEM_ADD + i, 0, 0);
                      }
                   }
                }
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 147e3dfce5..e906627c3e 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -1769,6 +1769,8 @@ void content_set_subsystem(unsigned idx)
 
    strlcpy(pending_subsystem_ident, subsystem->ident, sizeof(pending_subsystem_ident));
    pending_subsystem_rom_num = subsystem->num_roms;
+   RARCH_LOG("[subsystem] settings current subsytem to: %d(%s) roms: %d\n",
+      pending_subsystem_id, pending_subsystem_ident, pending_subsystem_rom_num);
 }
 
 /* Add a rom to the subsystem rom buffer */