diff --git a/menu/menu_entries_cbs_scan.c b/menu/menu_entries_cbs_scan.c
index 8531e020cb..6f55f742ca 100644
--- a/menu/menu_entries_cbs_scan.c
+++ b/menu/menu_entries_cbs_scan.c
@@ -40,6 +40,21 @@ static int action_scan_directory(const char *path,
    return 0;
 }
 
+static int menu_entries_cbs_init_bind_scan_compare_type(menu_file_list_cbs_t *cbs,
+      unsigned type)
+{
+   switch (type)
+   {
+      case MENU_FILE_DIRECTORY:
+         cbs->action_scan = action_scan_directory;
+         break;
+      default:
+         return -1;
+   }
+
+   return 0;
+}
+
 void menu_entries_cbs_init_bind_scan(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx,
       const char *elem0, const char *elem1,
@@ -50,10 +65,6 @@ void menu_entries_cbs_init_bind_scan(menu_file_list_cbs_t *cbs,
 
    cbs->action_scan = NULL;
 
-   switch (type)
-   {
-      case MENU_FILE_DIRECTORY:
-         cbs->action_scan = action_scan_directory;
-         break;
-   }
+   menu_entries_cbs_init_bind_scan_compare_type(cbs, type);
+
 }
diff --git a/menu/menu_entries_cbs_start.c b/menu/menu_entries_cbs_start.c
index 5201389a48..96c10481fa 100644
--- a/menu/menu_entries_cbs_start.c
+++ b/menu/menu_entries_cbs_start.c
@@ -297,19 +297,9 @@ int menu_entries_cbs_init_bind_start_compare_label(menu_file_list_cbs_t *cbs,
    return 0;
 }
 
-void menu_entries_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
-      const char *path, const char *label, unsigned type, size_t idx,
-      const char *elem0, const char *elem1,
-      uint32_t label_hash, uint32_t menu_label_hash)
+static int menu_entries_cbs_init_bind_start_compare_type(menu_file_list_cbs_t *cbs,
+      unsigned type)
 {
-   if (!cbs)
-      return;
-
-   cbs->action_start = action_start_lookup_setting;
-   
-   if (menu_entries_cbs_init_bind_start_compare_label(cbs, label_hash) == 0)
-      return;
-
    if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
          && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
       cbs->action_start = action_start_shader_action_parameter;
@@ -327,4 +317,24 @@ void menu_entries_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
       cbs->action_start = action_start_performance_counters_frontend;
    else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
       cbs->action_start = action_start_core_setting;
+   else
+      return -1;
+
+   return 0;
+}
+
+void menu_entries_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
+      const char *path, const char *label, unsigned type, size_t idx,
+      const char *elem0, const char *elem1,
+      uint32_t label_hash, uint32_t menu_label_hash)
+{
+   if (!cbs)
+      return;
+
+   cbs->action_start = action_start_lookup_setting;
+   
+   if (menu_entries_cbs_init_bind_start_compare_label(cbs, label_hash) == 0)
+      return;
+
+   menu_entries_cbs_init_bind_start_compare_type(cbs, type);
 }