diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 8dfddbab60..5af8cf7604 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1926,7 +1926,9 @@ static int menu_displaylist_parse(menu_displaylist_info_t *info,
                   break;
             }
 
-            if (menu_displaylist_parse_historylist(info, playlist) == 0)
+            ret = menu_displaylist_parse_historylist(info, playlist);
+
+            if (ret == 0)
             {
                *need_refresh = true;
                *need_push    = true;
diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c
index ed8f37e219..ed79ba6d54 100644
--- a/menu/menu_entries_cbs_ok.c
+++ b/menu/menu_entries_cbs_ok.c
@@ -407,7 +407,7 @@ static int action_ok_playlist_collection(const char *path,
    strlcpy(info.path, path, sizeof(info.path));
    strlcpy(info.label, label, sizeof(info.label));
 
-   return menu_displaylist_push_list(&info, DISPLAYLIST_PLAYLIST_COLLECTION);
+   return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
 }
 
 static int action_ok_content_collection_list(const char *path,