diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c
index 79eb0ba820..c968b8db5d 100644
--- a/menu/menu_entries_cbs_iterate.c
+++ b/menu/menu_entries_cbs_iterate.c
@@ -155,6 +155,7 @@ static int action_iterate_help(char *s, size_t len, const char *label)
       RARCH_MENU_TOGGLE,
       RARCH_QUIT_KEY,
       RETRO_DEVICE_ID_JOYPAD_X,
+      RETRO_DEVICE_ID_JOYPAD_Y,
    };
    char desc[ARRAY_SIZE(binds)][64];
    menu_handle_t *menu    = menu_driver_get_ptr();
@@ -188,6 +189,7 @@ static int action_iterate_help(char *s, size_t len, const char *label)
          "Enter/Exit Menu: %-20s\n"
          " Exit RetroArch: %-20s\n"
          "Toggle Keyboard: %-20s\n"
+         "           Scan: %-20s\n"
          " \n"
 
          "To run content:\n"
@@ -199,7 +201,7 @@ static int action_iterate_help(char *s, size_t len, const char *label)
          " \n"
 
          "Press Accept/OK to continue.",
-      desc[0], desc[1], desc[2], desc[3], desc[4], desc[5], desc[6], desc[7]);
+      desc[0], desc[1], desc[2], desc[3], desc[4], desc[5], desc[6], desc[7], desc[8]);
 
    return 0;
 }
diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index 789a0303f0..5c3fa9b812 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -515,7 +515,7 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
          menu_input_search_start();
          break;
 
-      case MENU_ACTION_TEST:
+      case MENU_ACTION_SCAN:
          rarch_main_data_msg_queue_push(DATA_TYPE_DB, "/home/squarepusher/roms", "cb_db_scan", 0, 1,
                true);
          break;
diff --git a/menu/menu_input.c b/menu/menu_input.c
index eb5d76b957..c52297b323 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -1014,7 +1014,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
    else if (trigger_input & (1ULL << settings->menu_search_btn))
       ret = MENU_ACTION_SEARCH;
    else if (trigger_input & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y))
-      ret = MENU_ACTION_TEST;
+      ret = MENU_ACTION_SCAN;
    else if (trigger_input & (1ULL << settings->menu_default_btn))
       ret = MENU_ACTION_START;
    else if (trigger_input & (1ULL << settings->menu_info_btn))
diff --git a/menu/menu_input.h b/menu/menu_input.h
index a3c32381c0..8e5d0b9a25 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -32,7 +32,7 @@ typedef enum menu_action
    MENU_ACTION_RIGHT,
    MENU_ACTION_OK,
    MENU_ACTION_SEARCH,
-   MENU_ACTION_TEST,
+   MENU_ACTION_SCAN,
    MENU_ACTION_CANCEL,
    MENU_ACTION_REFRESH,
    MENU_ACTION_SELECT,