diff --git a/settings_data.c b/settings_data.c
index 99a93dbe93..73499c078c 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -3041,17 +3041,6 @@ static bool setting_data_append_list_general_options(
          general_write_handler,
          general_read_handler);
 
-   CONFIG_BOOL(
-         g_settings.history_list_enable,
-         "history_list_enable",
-         "History List Enable",
-         true,
-         "OFF",
-         "ON",
-         group_info.name,
-         subgroup_info.name,
-         general_write_handler,
-         general_read_handler);
 
    CONFIG_UINT(g_settings.libretro_log_level,
          "libretro_log_level",
@@ -4585,6 +4574,35 @@ static bool setting_data_append_list_netplay_options(
    return true;
 }
 
+static bool setting_data_append_list_playlist_options(
+      rarch_setting_t **list,
+      rarch_setting_info_t *list_info)
+{
+   rarch_setting_group_info_t group_info;
+   rarch_setting_group_info_t subgroup_info;
+
+   START_GROUP(group_info, "Playlist Options");
+   settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_CATEGORY);
+   START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
+
+   CONFIG_BOOL(
+         g_settings.history_list_enable,
+         "history_list_enable",
+         "History List Enable",
+         true,
+         "OFF",
+         "ON",
+         group_info.name,
+         subgroup_info.name,
+         general_write_handler,
+         general_read_handler);
+
+   END_SUB_GROUP(list, list_info);
+   END_GROUP(list, list_info);
+
+   return true;
+}
+
 static bool setting_data_append_list_user_options(
       rarch_setting_t **list,
       rarch_setting_info_t *list_info)
@@ -5081,6 +5099,12 @@ rarch_setting_t *setting_data_new(unsigned mask)
          goto error;
    }
 
+   if (mask & SL_FLAG_PLAYLIST_OPTIONS)
+   {
+      if (!setting_data_append_list_playlist_options(&list, list_info))
+         goto error;
+   }
+
    if (mask & SL_FLAG_NETPLAY_OPTIONS)
    {
       if (!setting_data_append_list_netplay_options(&list, list_info))
diff --git a/settings_list.h b/settings_list.h
index a6ae756e39..5283b43274 100644
--- a/settings_list.h
+++ b/settings_list.h
@@ -61,21 +61,22 @@ enum setting_flags
 
 enum setting_list_flags
 {
-   SL_FLAG_MAIN_MENU       =  (1 << 0),
-   SL_FLAG_DRIVER_OPTIONS  =  (1 << 1),
-   SL_FLAG_GENERAL_OPTIONS =  (1 << 2),
-   SL_FLAG_VIDEO_OPTIONS   =  (1 << 3),
-   SL_FLAG_SHADER_OPTIONS  =  (1 << 4),
-   SL_FLAG_FONT_OPTIONS    =  (1 << 5),
-   SL_FLAG_AUDIO_OPTIONS   =  (1 << 6),
-   SL_FLAG_INPUT_OPTIONS   =  (1 << 7),
-   SL_FLAG_OVERLAY_OPTIONS =  (1 << 8),
-   SL_FLAG_MENU_OPTIONS    =  (1 << 9),
-   SL_FLAG_NETPLAY_OPTIONS =  (1 << 10),
-   SL_FLAG_USER_OPTIONS    =  (1 << 11),
-   SL_FLAG_PATH_OPTIONS    =  (1 << 12),
-   SL_FLAG_PRIVACY_OPTIONS =  (1 << 13),
-   SL_FLAG_ALL             =  (1 << 14),
+   SL_FLAG_MAIN_MENU        =  (1 << 0),
+   SL_FLAG_DRIVER_OPTIONS   =  (1 << 1),
+   SL_FLAG_GENERAL_OPTIONS  =  (1 << 2),
+   SL_FLAG_VIDEO_OPTIONS    =  (1 << 3),
+   SL_FLAG_SHADER_OPTIONS   =  (1 << 4),
+   SL_FLAG_FONT_OPTIONS     =  (1 << 5),
+   SL_FLAG_AUDIO_OPTIONS    =  (1 << 6),
+   SL_FLAG_INPUT_OPTIONS    =  (1 << 7),
+   SL_FLAG_OVERLAY_OPTIONS  =  (1 << 8),
+   SL_FLAG_MENU_OPTIONS     =  (1 << 9),
+   SL_FLAG_NETPLAY_OPTIONS  =  (1 << 10),
+   SL_FLAG_USER_OPTIONS     =  (1 << 11),
+   SL_FLAG_PATH_OPTIONS     =  (1 << 12),
+   SL_FLAG_PRIVACY_OPTIONS  =  (1 << 13),
+   SL_FLAG_PLAYLIST_OPTIONS =  (1 << 14),
+   SL_FLAG_ALL              =  (1 << 15),
 };
 
 #define SL_FLAG_ALL_SETTINGS (SL_FLAG_ALL - SL_FLAG_MAIN_MENU)