diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index d8b9b260a1..bb7c606ab8 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -726,6 +726,10 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = {
    {
       MENU_ENUM_LABEL_FAVORITES,
       deferred_push_detect_core_list
+   },
+   {
+      MENU_ENUM_LABEL_VIDEO_FILTER,
+      deferred_push_video_filter
    }
 };
 
@@ -1299,9 +1303,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
          case MENU_LABEL_VIDEO_SHADER_PASS:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_shader_pass);
             break;
-         case MENU_LABEL_VIDEO_FILTER:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_filter);
-            break;
          case MENU_LABEL_MENU_WALLPAPER:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_images);
             break;
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 106f8e24eb..7f01a5cebb 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -4444,15 +4444,22 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
          case FILE_TYPE_DOWNLOAD_CORE_INFO:
             break;
          case FILE_TYPE_RDB:
-            switch (menu_label_hash)
+            if (string_is_equal(menu_label,
+                     msg_hash_to_str(MENU_ENUM_LABEL_HORIZONTAL_MENU)))
             {
-               case MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST:
-                  BIND_ACTION_OK(cbs, action_ok_deferred_list_stub);
-                  break;
-               case MENU_LABEL_DATABASE_MANAGER_LIST:
-               case MENU_VALUE_HORIZONTAL_MENU:
-                  BIND_ACTION_OK(cbs, action_ok_database_manager_list);
-                  break;
+               BIND_ACTION_OK(cbs, action_ok_database_manager_list);
+            }
+            else
+            {
+               switch (menu_label_hash)
+               {
+                  case MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST:
+                     BIND_ACTION_OK(cbs, action_ok_deferred_list_stub);
+                     break;
+                  case MENU_LABEL_DATABASE_MANAGER_LIST:
+                     BIND_ACTION_OK(cbs, action_ok_database_manager_list);
+                     break;
+               }
             }
             break;
          case FILE_TYPE_RDB_ENTRY:
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 19ff1e68ae..c4c680debc 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -468,6 +468,14 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
    {
       MENU_ENUM_LABEL_DEFERRED_THUMBNAILS_UPDATER_LIST,
       action_get_online_thumbnails_updater_list
+   },
+   {
+      MENU_ENUM_LABEL_VIDEO_FILTER,
+      action_get_title_video_filter
+   },
+   {
+      MENU_ENUM_LABEL_HELP_LIST,
+      action_get_title_help
    }
 };
 
@@ -1033,7 +1041,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_DEFERRED_ACCOUNTS_LIST:
             BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_list);
             break;
-         case MENU_LABEL_HELP_LIST:
          case MENU_LABEL_HELP:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_help);
             break;
@@ -1044,9 +1051,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_XMB_FONT:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_font_path);
             break;
-         case MENU_LABEL_VIDEO_FILTER:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_video_filter);
-            break;
          case MENU_LABEL_AUDIO_DSP_PLUGIN:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_audio_filter);
             break;
diff --git a/msg_hash.h b/msg_hash.h
index 5b0e4dc6da..ca5ddfad21 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1934,13 +1934,9 @@ enum msg_hash_enums
 #define MENU_LABEL_AUDIO_RESAMPLER_DRIVER_SINC                                 0x7c9dec52U
 #define MENU_LABEL_AUDIO_RESAMPLER_DRIVER_CC                                   0x0059732bU
 
-#define MENU_LABEL_VIDEO_FILTER                                                0x1c0eb741U
-#define MENU_LABEL_HELP_LIST                                                   0x006af669U
-
 /* Main menu */
 #define MENU_LABEL_NETPLAY                                                     0x0b511d22U
 #define MENU_LABEL_HELP                                                        0x7c97d2eeU
-#define MENU_VALUE_HORIZONTAL_MENU                                             0x35761704U
 
 const char *msg_hash_to_str(enum msg_hash_enums msg);