diff --git a/frontend/menu/menu_settings.c b/frontend/menu/menu_settings.c
index 960237d297..eb3f0b4d21 100644
--- a/frontend/menu/menu_settings.c
+++ b/frontend/menu/menu_settings.c
@@ -359,9 +359,10 @@ int menu_set_settings(unsigned setting, unsigned action)
             if (rgui->current_pad < MAX_PLAYERS - 1)
                rgui->current_pad++;
          }
-
+#ifdef HAVE_RGUI
          if (port != rgui->current_pad)
             rgui->need_refresh = true;
+#endif
          port = rgui->current_pad;
          break;
       case RGUI_SETTINGS_BIND_DEVICE:
diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c
index 71335bd8e3..0196eb6120 100644
--- a/frontend/menu/rmenu.c
+++ b/frontend/menu/rmenu.c
@@ -780,6 +780,7 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
       case SETTING_REWIND_GRANULARITY:
       case SETTING_EMU_AUDIO_MUTE:
       case SETTING_CONTROLS_NUMBER:
+      case SETTING_CONTROLS_BIND_DEVICE_TYPE:
       case INGAME_MENU_LOAD_STATE:
       case INGAME_MENU_SAVE_STATE:
       case SETTING_ROTATION:
@@ -1539,6 +1540,10 @@ static int select_setting(void *data, uint64_t action)
             strlcpy(text, "Player", sizeof(text));
             menu_set_settings_label(setting_text, sizeof(setting_text), &w, settings_lut[i]);
             break;
+         case SETTING_CONTROLS_BIND_DEVICE_TYPE:
+            strlcpy(text, "Device Type", sizeof(text));
+            menu_set_settings_label(setting_text, sizeof(setting_text), &w, settings_lut[i]);
+            break;
          case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_B:
          case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_Y:
          case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_SELECT:
@@ -2205,6 +2210,7 @@ static void* rgui_init(void)
    settings_lut[SETTING_REWIND_GRANULARITY]         = RGUI_SETTINGS_REWIND_GRANULARITY;
    settings_lut[SETTING_EMU_AUDIO_MUTE]             = RGUI_SETTINGS_AUDIO_MUTE;
    settings_lut[SETTING_CONTROLS_NUMBER]            = RGUI_SETTINGS_BIND_PLAYER;
+   settings_lut[SETTING_CONTROLS_BIND_DEVICE_TYPE]  = RGUI_SETTINGS_BIND_DEVICE_TYPE;
    settings_lut[INGAME_MENU_LOAD_STATE]             = RGUI_SETTINGS_SAVESTATE_LOAD;
    settings_lut[INGAME_MENU_SAVE_STATE]             = RGUI_SETTINGS_SAVESTATE_SAVE;
    settings_lut[SETTING_ROTATION]                   = RGUI_SETTINGS_VIDEO_ROTATION;
diff --git a/frontend/menu/rmenu.h b/frontend/menu/rmenu.h
index 5cec7b3efe..a6594ce244 100644
--- a/frontend/menu/rmenu.h
+++ b/frontend/menu/rmenu.h
@@ -95,6 +95,7 @@ enum
    SETTING_PATH_SYSTEM,
    SETTING_PATH_END,
    SETTING_CONTROLS_NUMBER,
+   SETTING_CONTROLS_BIND_DEVICE_TYPE,
    SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_B,
    SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_Y,
    SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_SELECT,