diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
index aa0ee31eda..b82f0dc95c 100644
--- a/intl/msg_hash_lbl.h
+++ b/intl/msg_hash_lbl.h
@@ -235,6 +235,8 @@ MSG_HASH(MENU_ENUM_LABEL_DATABASE_MANAGER,
       "database_manager")
 MSG_HASH(MENU_ENUM_LABEL_DATABASE_MANAGER_LIST,
       "database_manager_list")
+MSG_HASH(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_LIST,
+      "deferred_configurations_list")
 MSG_HASH(MENU_ENUM_LABEL_DEFERRED_PLAYLIST_LIST,
       "deferred_playlist_list")
 MSG_HASH(MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST,
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 4e184ac115..1d47973cbc 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -806,6 +806,14 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = {
    {
       MENU_ENUM_LABEL_CONTENT_HISTORY_PATH,
       deferred_push_content_history_path
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST,
+      deferred_push_playlist_settings_list
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_LIST,
+      deferred_push_configurations_list
    }
 };
 
@@ -1232,12 +1240,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
    {
       switch (label_hash)
       {
-         case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST: /* TODO/FIXME */
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations_list);
-            break;
-         case MENU_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_playlist_settings_list);
-            break;
          case MENU_LABEL_DEFERRED_RECORDING_SETTINGS_LIST:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_recording_settings_list);
             break;
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 18ed001faf..53df22f484 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -434,6 +434,10 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
       MENU_ENUM_LABEL_DEFERRED_DRIVER_SETTINGS_LIST,
       action_get_driver_settings_list
    },
+   {
+      MENU_ENUM_LABEL_DEFERRED_VIDEO_SETTINGS_LIST,
+      action_get_video_settings_list
+   },
    {
       MENU_ENUM_LABEL_DEFERRED_AUDIO_SETTINGS_LIST,
       action_get_audio_settings_list
@@ -673,6 +677,30 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
    {
       MENU_ENUM_LABEL_THUMBNAILS_DIRECTORY,
       action_get_title_thumbnails_directory
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_INPUT_SETTINGS_LIST,
+      action_get_input_settings_list
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST,
+      action_get_playlist_settings_list
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CORE_UPDATER_LIST,
+      action_get_core_updater_list
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_USER_BINDS_LIST,
+      action_get_title_input_binds_list
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_INPUT_HOTKEY_BINDS_LIST,
+      action_get_input_hotkey_binds_settings_list
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_LIST,
+      action_get_configurations_list
    }
 };
 
@@ -1070,36 +1098,15 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL:
             BIND_ACTION_GET_TITLE(cbs, action_get_load_content_special);
             break;
-         case MENU_LABEL_DEFERRED_CORE_UPDATER_LIST:
-            BIND_ACTION_GET_TITLE(cbs, action_get_core_updater_list);
-            break;
-         case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST:
-            BIND_ACTION_GET_TITLE(cbs, action_get_configurations_list);
-            break;
          case MENU_LABEL_FRONTEND_COUNTERS:
             BIND_ACTION_GET_TITLE(cbs, action_get_frontend_counters_list);
             break;
          case MENU_LABEL_CORE_COUNTERS:
             BIND_ACTION_GET_TITLE(cbs, action_get_core_counters_list);
             break;
-         case MENU_LABEL_DEFERRED_USER_BINDS_LIST:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_input_binds_list);
-            break;
-         case MENU_LABEL_DEFERRED_INPUT_HOTKEY_BINDS_LIST:
-            BIND_ACTION_GET_TITLE(cbs, action_get_input_hotkey_binds_settings_list);
-            break;
-         case MENU_LABEL_DEFERRED_VIDEO_SETTINGS_LIST:
-            BIND_ACTION_GET_TITLE(cbs, action_get_video_settings_list);
-            break;
-         case MENU_LABEL_DEFERRED_INPUT_SETTINGS_LIST:
-            BIND_ACTION_GET_TITLE(cbs, action_get_input_settings_list);
-            break;
          case MENU_LABEL_DEFERRED_RECORDING_SETTINGS_LIST:
             BIND_ACTION_GET_TITLE(cbs, action_get_recording_settings_list);
             break;
-         case MENU_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST:
-            BIND_ACTION_GET_TITLE(cbs, action_get_playlist_settings_list);
-            break;
          case MENU_LABEL_CONTENT_COLLECTION_LIST:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_collection);
             break;
diff --git a/msg_hash.h b/msg_hash.h
index fe0962a679..2d64443246 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -917,6 +917,7 @@ enum msg_hash_enums
    MENU_LABEL(BROWSE_URL),
    MENU_LABEL(BROWSE_START),
    /* Deferred */
+   MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_LIST,
    MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST,
    MENU_ENUM_LABEL_DEFERRED_PLAYLIST_LIST,
    MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST,
@@ -1761,14 +1762,7 @@ enum msg_hash_enums
 #define MENU_LABEL_DEFERRED_RDB_ENTRY_DETAIL                                   0xc35416c0U
 #define MENU_LABEL_DEFERRED_RPL_ENTRY_ACTIONS                                  0x358a7494U
 #define MENU_LABEL_DEFERRED_CORE_LIST                                          0xf157d289U
-#define MENU_LABEL_DEFERRED_CORE_UPDATER_LIST                                  0xc315f682U
-#define MENU_LABEL_DEFERRED_DRIVER_SETTINGS_LIST                               0xaa5efefcU
-#define MENU_LABEL_DEFERRED_VIDEO_SETTINGS_LIST                                0x83c65827U
-#define MENU_LABEL_DEFERRED_AUDIO_SETTINGS_LIST                                0x5bba25e2U
 #define MENU_LABEL_DEFERRED_RECORDING_SETTINGS_LIST                            0x05548d52U
-#define MENU_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST                             0x9518e0c7U
-#define MENU_LABEL_DEFERRED_INPUT_SETTINGS_LIST                                0x050bec60U
-#define MENU_LABEL_DEFERRED_USER_BINDS_LIST                                    0x28c5750eU
 #define MENU_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST                              0x1322324cU
 #define MENU_LABEL_DEFERRED_ACCOUNTS_LIST                                      0x3d2b8860U
 #define MENU_LABEL_DEFERRED_ARCHIVE_ACTION_DETECT_CORE                         0xdc9c0064U
@@ -1777,8 +1771,6 @@ enum msg_hash_enums
 #define MENU_LABEL_DEFERRED_ARCHIVE_OPEN                                       0xfa0938b8U
 #define MENU_LABEL_DEFERRED_CORE_CONTENT_LIST                                  0x76150c63U
 #define MENU_LABEL_DEFERRED_LAKKA_LIST                                         0x3db437c4U
-#define MENU_LABEL_DEFERRED_INPUT_HOTKEY_BINDS_LIST                            0x10b41d97U
-#define MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST                                0x679a1b0bU
 #define MENU_LABEL_DEFERRED_BROWSE_URL_START                                   0xcef58296U
 
 #define MENU_LABEL_RDB_ENTRY_START_CONTENT                                     0x95025a55U