diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index cd0d7c7892..5dbc82d44b 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -458,15 +458,6 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
    {
       switch (type)
       {
-         case MENU_SETTING_NO_ITEM:
-            switch (menu_label_hash)
-            {
-               case MENU_VALUE_HORIZONTAL_MENU:
-               case MENU_VALUE_MAIN_MENU:
-                  BIND_ACTION_LEFT(cbs, action_left_mainmenu);
-                  break;
-            }
-            break;
          case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX:
             BIND_ACTION_LEFT(cbs, disk_options_disk_idx_left);
             break;
@@ -535,6 +526,20 @@ int menu_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
 
    BIND_ACTION_LEFT(cbs, bind_left_generic);
 
+   if (type == MENU_SETTING_NO_ITEM)
+   {
+      switch (menu_label_hash)
+      {
+         case MENU_VALUE_HORIZONTAL_MENU:
+         case MENU_VALUE_MAIN_MENU:
+         case 153956705: /* TODO/FIXME - dehardcode */
+            BIND_ACTION_LEFT(cbs, action_left_mainmenu);
+            return 0;
+         default:
+            break;
+      }
+   }
+
    if (menu_cbs_init_bind_left_compare_label(cbs, label, label_hash, menu_label_hash, elem0) == 0)
       return 0;
 
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 3c112a6b19..5a4d1e445b 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -552,6 +552,20 @@ int menu_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
       return -1;
 
    BIND_ACTION_RIGHT(cbs, bind_right_generic);
+    
+    if (type == MENU_SETTING_NO_ITEM)
+    {
+        switch (menu_label_hash)
+        {
+            case MENU_VALUE_HORIZONTAL_MENU:
+            case MENU_VALUE_MAIN_MENU:
+            case 153956705: /* TODO/FIXME - dehardcode */
+                BIND_ACTION_RIGHT(cbs, action_right_mainmenu);
+                return 0;
+            default:
+                break;
+        }
+    }
 
    if (menu_cbs_init_bind_right_compare_label(cbs, label, label_hash, menu_label_hash, elem0) == 0)
       return 0;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 3c4d84369f..6c7f4a18fc 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1929,7 +1929,7 @@ static int menu_displaylist_parse_options(menu_displaylist_info_t *info)
 #else
    menu_entries_push(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
-         "", 0, 0, 0);
+         "", MENU_SETTING_NO_ITEM, 0, 0);
 #endif
 
    return 0;
@@ -2125,7 +2125,7 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool ho
       {
          menu_entries_push(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
-               "", 0, 0, 0);
+               "", MENU_SETTING_NO_ITEM, 0, 0);
       }
 
       string_list_free(str_list);
@@ -2402,7 +2402,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
 #else
          menu_entries_push(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
-               "", 0, 0, 0);
+               "", MENU_SETTING_NO_ITEM, 0, 0);
          ret = 0;
 #endif
          info->need_refresh = true;