diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index bd7f437146..6c979de040 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -2017,7 +2017,7 @@ void menu_populate_entries(void *data, unsigned menu_type)
          file_list_push(rgui->selection_buf, "Configure All (RetroPad)", RGUI_SETTINGS_CUSTOM_BIND_ALL, 0);
          file_list_push(rgui->selection_buf, "Default All (RetroPad)", RGUI_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, 0);
 
-         last = (driver.input && driver.input->set_keybinds && !driver.input->get_joypad_driver) ? RGUI_SETTINGS_BIND_R3 : (RGUI_SETTINGS_BIND_MENU_TOGGLE+1);
+         last = (driver.input && driver.input->set_keybinds && !driver.input->get_joypad_driver) ? RGUI_SETTINGS_BIND_R3 : RGUI_SETTINGS_BIND_MENU_TOGGLE;
          for (i = RGUI_SETTINGS_BIND_BEGIN; i <= last; i++)
             file_list_push(rgui->selection_buf, input_config_bind_map[i - RGUI_SETTINGS_BIND_BEGIN].desc, i, 0);
          break;
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 7bbbc1e6cc..8c2521c15e 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -196,6 +196,7 @@ typedef enum
    RGUI_SETTINGS_BIND_ANALOG_RIGHT_Y_PLUS,
    RGUI_SETTINGS_BIND_ANALOG_RIGHT_Y_MINUS,
 
+   RGUI_SETTINGS_BIND_TURBO_ENABLE,
    RGUI_SETTINGS_BIND_FAST_FORWARD_KEY,
    RGUI_SETTINGS_BIND_FAST_FORWARD_HOLD_KEY,
    RGUI_SETTINGS_BIND_LOAD_STATE_KEY,
diff --git a/frontend/menu/menu_settings.c b/frontend/menu/menu_settings.c
index c8dd54a75f..2e8d65755a 100644
--- a/frontend/menu/menu_settings.c
+++ b/frontend/menu/menu_settings.c
@@ -946,6 +946,7 @@ int menu_set_settings(void *data, unsigned setting, unsigned action)
       case RGUI_SETTINGS_BIND_R2:
       case RGUI_SETTINGS_BIND_L3:
       case RGUI_SETTINGS_BIND_R3:
+      case RGUI_SETTINGS_BIND_TURBO_ENABLE:
       case RGUI_SETTINGS_BIND_ANALOG_LEFT_X_PLUS:
       case RGUI_SETTINGS_BIND_ANALOG_LEFT_X_MINUS:
       case RGUI_SETTINGS_BIND_ANALOG_LEFT_Y_PLUS:
@@ -985,7 +986,6 @@ int menu_set_settings(void *data, unsigned setting, unsigned action)
       case RGUI_SETTINGS_BIND_DISK_NEXT:
       case RGUI_SETTINGS_BIND_GRAB_MOUSE_TOGGLE:
       case RGUI_SETTINGS_BIND_MENU_TOGGLE:
-      case RGUI_SETTINGS_BIND_MENU_TOGGLE+1:
          if (driver.input->set_keybinds && !driver.input->get_joypad_driver)
          {
             unsigned keybind_action = KEYBINDS_ACTION_NONE;
@@ -2056,6 +2056,7 @@ void menu_set_settings_label(char *type_str, size_t type_str_size, unsigned *w,
       case RGUI_SETTINGS_BIND_R2:
       case RGUI_SETTINGS_BIND_L3:
       case RGUI_SETTINGS_BIND_R3:
+      case RGUI_SETTINGS_BIND_TURBO_ENABLE:
       case RGUI_SETTINGS_BIND_ANALOG_LEFT_X_PLUS:
       case RGUI_SETTINGS_BIND_ANALOG_LEFT_X_MINUS:
       case RGUI_SETTINGS_BIND_ANALOG_LEFT_Y_PLUS:
@@ -2095,7 +2096,6 @@ void menu_set_settings_label(char *type_str, size_t type_str_size, unsigned *w,
       case RGUI_SETTINGS_BIND_DISK_NEXT:
       case RGUI_SETTINGS_BIND_GRAB_MOUSE_TOGGLE:
       case RGUI_SETTINGS_BIND_MENU_TOGGLE:
-      case RGUI_SETTINGS_BIND_MENU_TOGGLE+1:
          input_get_bind_string(type_str, &g_settings.input.binds[rgui->current_pad][type - RGUI_SETTINGS_BIND_BEGIN], type_str_size);
          break;
       case RGUI_SETTINGS_AUDIO_VOLUME_LEVEL: