diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index a996377b95..9f11d3da10 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1905,7 +1905,6 @@ static void xmb_list_insert(file_list_t *list,
 static void xmb_list_free(file_list_t *list,
       size_t idx, size_t list_size)
 {
-   file_list_free_userdata(list, idx);
 }
 
 static void xmb_list_cache(menu_list_type_t type, unsigned action)
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index caac83b253..de51d22dfd 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -190,6 +190,7 @@ void  menu_driver_list_free(file_list_t *list, size_t idx, size_t list_size)
    if (driver->list_free)
       driver->list_free(list, idx, list_size);
 
+   file_list_free_userdata  (list, idx);
    file_list_free_actiondata(list, idx);
 }