diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index d3746dc59c..be6b057b88 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -790,6 +790,10 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = {
    {
       MENU_ENUM_LABEL_CONFIGURATIONS,
       deferred_push_configurations
+   },
+   {
+      MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS,
+      deferred_push_core_cheat_options
    }
 };
 
@@ -1331,9 +1335,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
          case MENU_LABEL_FRONTEND_COUNTERS:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_frontend_counters);
             break;
-         case MENU_LABEL_CORE_CHEAT_OPTIONS:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_cheat_options);
-            break;
          case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_input_remapping_options);
             break;
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index e511a5566d..f89ff8b8a8 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -556,6 +556,14 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
    {
       MENU_ENUM_LABEL_CORE_OPTIONS,
       action_get_core_options_list
+   },
+   {
+      MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS,
+      action_get_core_cheat_options_list
+   },
+   {
+      MENU_ENUM_LABEL_SHADER_OPTIONS,
+      action_get_shader_options_list
    }
 };
 
@@ -1031,12 +1039,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS:
             BIND_ACTION_GET_TITLE(cbs, action_get_input_remapping_options_list);
             break;
-         case MENU_LABEL_CORE_CHEAT_OPTIONS:
-            BIND_ACTION_GET_TITLE(cbs, action_get_core_cheat_options_list);
-            break;
-         case MENU_LABEL_SHADER_OPTIONS:
-            BIND_ACTION_GET_TITLE(cbs, action_get_shader_options_list);
-            break;
          case MENU_LABEL_FRONTEND_COUNTERS:
             BIND_ACTION_GET_TITLE(cbs, action_get_frontend_counters_list);
             break;
diff --git a/msg_hash.h b/msg_hash.h
index 3d23073c70..2b7aba8fa4 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1833,8 +1833,6 @@ enum msg_hash_enums
 #define MENU_LABEL_FRONTEND_COUNTERS                                           0xe5696877U
 #define MENU_LABEL_CORE_COUNTERS                                               0x64cc83e0U
 #define MENU_LABEL_ACHIEVEMENT_LIST                                            0x7b90fc49U
-#define MENU_LABEL_SHADER_OPTIONS                                              0x1f7d2fc7U
-#define MENU_LABEL_CORE_CHEAT_OPTIONS                                          0x9293171dU
 #define MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS                                0x7836a8caU
 #define MENU_LABEL_DATABASE_MANAGER_LIST                                       0x7f853d8fU
 #define MENU_LABEL_CURSOR_MANAGER_LIST                                         0xa969e378U