diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index a800786a4f..2ba307713c 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -770,6 +770,10 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = {
    {
       MENU_ENUM_LABEL_MENU_WALLPAPER,
       deferred_push_images
+   },
+   {
+      MENU_ENUM_LABEL_CHEAT_FILE_LOAD,
+      deferred_push_cheat_file_load
    }
 };
 
@@ -1227,9 +1231,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
          case MENU_LABEL_CURSOR_MANAGER_LIST:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list);
             break;
-         case MENU_LABEL_CHEAT_FILE_LOAD:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cheat_file_load);
-            break;
          case MENU_LABEL_REMAP_FILE_LOAD:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_remap_file_load);
             break;
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 22fbcf73b4..fb36802d73 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -3844,6 +3844,21 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
       BIND_ACTION_OK(cbs, action_ok_shader_apply_changes);
       return 0;
    }
+   else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES)))
+   {
+      BIND_ACTION_OK(cbs, action_ok_cheat_apply_changes);
+      return 0;
+   }
+   else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_FILE_SAVE_AS)))
+   {
+      BIND_ACTION_OK(cbs, action_ok_cheat_file_save_as);
+      return 0;
+   }
+   else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CHEAT_FILE_LOAD)))
+   {
+      BIND_ACTION_OK(cbs, action_ok_cheat_file);
+      return 0;
+   }
    else if (cbs->enum_idx != MSG_UNKNOWN)
    {
       switch (cbs->enum_idx)
@@ -4269,9 +4284,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
    {
       switch (hash)
       {
-         case MENU_LABEL_CHEAT_FILE_LOAD:
-            BIND_ACTION_OK(cbs, action_ok_cheat_file);
-            break;
          case MENU_LABEL_AUDIO_DSP_PLUGIN:
             BIND_ACTION_OK(cbs, action_ok_audio_dsp_plugin);
             break;
@@ -4290,12 +4302,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_DETECT_CORE_LIST_OK:
             BIND_ACTION_OK(cbs, action_ok_file_load_detect_core);
             break;
-         case MENU_LABEL_CHEAT_APPLY_CHANGES:
-            BIND_ACTION_OK(cbs, action_ok_cheat_apply_changes);
-            break;
-         case MENU_LABEL_CHEAT_FILE_SAVE_AS:
-            BIND_ACTION_OK(cbs, action_ok_cheat_file_save_as);
-            break;
          case MENU_LABEL_REMAP_FILE_SAVE_CORE:
             BIND_ACTION_OK(cbs, action_ok_remap_file_save_core);
             break;
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index e1c8ee26c5..bfe05972f0 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -524,6 +524,14 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
    {
       MENU_ENUM_LABEL_DISK_IMAGE_APPEND,
       action_get_title_disk_image_append
+   },
+   {
+      MENU_ENUM_LABEL_CHEAT_FILE_LOAD,
+      action_get_title_cheat_file_load
+   },
+   {
+      MENU_ENUM_LABEL_CHEAT_DATABASE_PATH,
+      action_get_title_cheat_directory
    }
 };
 
@@ -1050,9 +1058,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_MANAGEMENT:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_action_generic);
             break;
-         case MENU_LABEL_CHEAT_FILE_LOAD:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_cheat_file_load);
-            break;
          case MENU_LABEL_REMAP_FILE_LOAD:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_remap_file_load);
             break;
@@ -1071,9 +1076,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_AUDIO_DSP_PLUGIN:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_audio_filter);
             break;
-         case MENU_LABEL_CHEAT_DATABASE_PATH:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_cheat_directory);
-            break;
          case MENU_LABEL_LIBRETRO_DIR_PATH:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_core_directory);
             break;
diff --git a/msg_hash.h b/msg_hash.h
index c17b677666..53850d8677 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1795,13 +1795,6 @@ enum msg_hash_enums
 #define MENU_LABEL_INPUT_OVERLAY                                               0x24e24796U
 #define MENU_LABEL_INPUT_OSK_OVERLAY                                           0x11f1c582U
 
-/* Cheat options */
-
-#define MENU_LABEL_CHEAT_DATABASE_PATH                                         0x01388b8aU
-#define MENU_LABEL_CHEAT_FILE_LOAD                                             0x57336148U
-#define MENU_LABEL_CHEAT_FILE_SAVE_AS                                          0x1f58dccaU
-#define MENU_LABEL_CHEAT_APPLY_CHANGES                                         0xde88aa27U
-
 /* Directory settings */
 
 #define MENU_LABEL_CURSOR_DIRECTORY                                            0xdee8d377U