diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index c3a1fe86fd..5dc3a09d3d 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -6687,7 +6687,7 @@ static int materialui_list_push(void *data, void *userdata,
                else
                   subsystem = subsystem_data;
 
-               menu_subsystem_populate(subsystem, info);
+               menu_subsystem_populate(subsystem, info->list);
             }
 
             if (settings->bools.menu_content_show_history)
diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index 5d5680ebe5..80acf623de 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -843,7 +843,7 @@ static int ozone_list_push(void *data, void *userdata,
                else
                   subsystem = subsystem_data;
 
-               menu_subsystem_populate(subsystem, info);
+               menu_subsystem_populate(subsystem, info->list);
             }
 
             if (settings->bools.menu_show_load_disc)
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 2dea7ab9d6..74631e1dc6 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -6189,7 +6189,7 @@ static int xmb_list_push(void *data, void *userdata,
                else
                   subsystem = subsystem_data;
 
-               menu_subsystem_populate(subsystem, info);
+               menu_subsystem_populate(subsystem, info->list);
             }
 
             if (settings->bools.menu_show_load_disc)
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 9b9ae36335..2f6a943d15 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -9227,7 +9227,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                if (sys_info && sys_info->subsystem.data)
                      subsystem = sys_info->subsystem.data;
 
-               menu_subsystem_populate(subsystem, info);
+               menu_subsystem_populate(subsystem, info->list);
             }
 
             if (settings->bools.menu_content_show_history)
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 085847ad41..05d32fd22f 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -3966,9 +3966,10 @@ void hex32_to_rgba_normalized(uint32_t hex, float* rgba, float alpha)
    rgba[3] = rgba[7] = rgba[11] = rgba[15] = alpha;
 }
 
-void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_displaylist_info_t *info)
+void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, void *data)
 {
    settings_t *settings = config_get_ptr();
+   file_list_t *list    = (file_list_t*)data;
    /* Note: Create this string here explicitly (rather than
     * using a #define elsewhere) since we need to be aware of
     * its length... */
@@ -4037,7 +4038,7 @@ void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_
                   strlcpy(s, tmp, sizeof(s));
                }
                
-               menu_entries_append_enum(info->list,
+               menu_entries_append_enum(list,
                   s,
                   msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_ADD),
                   MENU_ENUM_LABEL_SUBSYSTEM_ADD,
@@ -4084,7 +4085,7 @@ void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_
                   }
                }
                
-               menu_entries_append_enum(info->list,
+               menu_entries_append_enum(list,
                   s,
                   msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_LOAD),
                   MENU_ENUM_LABEL_SUBSYSTEM_LOAD,
@@ -4125,7 +4126,7 @@ void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_
                }
             }
             
-            menu_entries_append_enum(info->list,
+            menu_entries_append_enum(list,
                s,
                msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_ADD),
                MENU_ENUM_LABEL_SUBSYSTEM_ADD,
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index ca2c972fd1..99444796dd 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -713,7 +713,7 @@ void menu_driver_destroy(void);
 
 void hex32_to_rgba_normalized(uint32_t hex, float* rgba, float alpha);
 
-void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, menu_displaylist_info_t *info);
+void menu_subsystem_populate(const struct retro_subsystem_info* subsystem, void *data);
 
 menu_handle_t *menu_driver_get_ptr(void);