diff --git a/driver.h b/driver.h
index 490411e082..cbe94afdcd 100644
--- a/driver.h
+++ b/driver.h
@@ -207,7 +207,7 @@ typedef struct input_driver
    bool (*key_pressed)(void *data, int key);
    void (*free)(void *data);
 #ifdef RARCH_CONSOLE
-   void (*set_default_keybind_lut)(unsigned device, unsigned port);
+   void (*set_default_keybinds)(unsigned device, unsigned port);
    void (*set_analog_dpad_mapping)(unsigned device, unsigned map_dpad_enum, unsigned controller_id);
 #endif
    const char *ident;
diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index a328e16d8a..aa44dbd14e 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -899,7 +899,8 @@ static int rgui_settings_toggle_setting(unsigned setting, rgui_action_t action,
          else if (action == RGUI_ACTION_RIGHT)
             g_settings.input.device[port]++;
          g_settings.input.device[port] %= RARCH_DEVICE_LAST;
-         driver.input->set_default_keybind_lut(g_settings.input.device[port], port);
+         if (driver.input->set_default_keybinds)
+            driver.input->set_default_keybinds(g_settings.input.device[port], port);
          driver.input->set_analog_dpad_mapping(g_settings.input.device[port], g_settings.input.dpad_emulation[port], port);
          break;
 #endif
diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c
index 40fbf0be3b..1caf69f77c 100644
--- a/frontend/menu/rmenu.c
+++ b/frontend/menu/rmenu.c
@@ -2041,7 +2041,8 @@ static int set_setting_action(void *data, unsigned switchvalue, uint64_t input)
 #endif
       case SETTING_CONTROLS_DEFAULT_ALL:
          if((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)) || (input & (1ULL << RMENU_DEVICE_NAV_START)))
-            driver.input->set_default_keybind_lut(g_settings.input.device[currently_selected_controller_menu], currently_selected_controller_menu);
+            if (driver.input->set_default_keybinds)
+               driver.input->set_default_keybinds(g_settings.input.device[currently_selected_controller_menu], currently_selected_controller_menu);
          break;
    }
 
diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp
index fc9f3fca66..c827671e5d 100644
--- a/frontend/menu/rmenu_xui.cpp
+++ b/frontend/menu/rmenu_xui.cpp
@@ -534,7 +534,8 @@ HRESULT CRetroArchControls::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled
          case SETTING_CONTROLS_DPAD_EMULATION:
             break;
          case SETTING_CONTROLS_DEFAULT_ALL:
-            driver.input->set_default_keybind_lut(g_settings.input.device[controlno], controlno);
+            if (driver.input->set_default_keybinds)
+               driver.input->set_default_keybinds(g_settings.input.device[controlno], controlno);
 
             for(i = 0; i < RARCH_FIRST_META_KEY; i++)
             {
diff --git a/gx/gx_input.c b/gx/gx_input.c
index d0237ae966..7c89905396 100644
--- a/gx/gx_input.c
+++ b/gx/gx_input.c
@@ -242,7 +242,7 @@ static void gx_input_set_analog_dpad_mapping(unsigned device, unsigned map_dpad_
    }
 }
 
-static void gx_set_default_keybind_lut(unsigned device, unsigned port)
+static void gx_set_default_keybinds(unsigned device, unsigned port)
 {
    switch (device)
    {
@@ -343,7 +343,7 @@ static void *gx_input_init(void)
 #endif
 
    for(unsigned i = 0; i < MAX_PLAYERS; i++)
-      gx_set_default_keybind_lut(0, i);
+      gx_set_default_keybinds(0, i);
 
    for(unsigned i = 0; i < MAX_PADS; i++)
       gx_input_set_analog_dpad_mapping(g_settings.input.device[i], g_settings.input.dpad_emulation[i], i);
@@ -642,7 +642,7 @@ const input_driver_t input_gx = {
    .input_state = gx_input_state,
    .key_pressed = gx_input_key_pressed,
    .free = gx_input_free_input,
-   .set_default_keybind_lut = gx_set_default_keybind_lut,
+   .set_default_keybinds = gx_set_default_keybinds,
    .set_analog_dpad_mapping = gx_input_set_analog_dpad_mapping,
    .ident = "gx",
 };
diff --git a/input/null.c b/input/null.c
index feb0ccba2c..ccd1352ac2 100644
--- a/input/null.c
+++ b/input/null.c
@@ -52,7 +52,7 @@ static void nullinput_input_free_input(void *data)
 }
 
 #ifdef RARCH_CONSOLE
-static void nullinput_set_default_keybind_lut(unsigned device, unsigned port)
+static void nullinput_set_default_keybinds(unsigned device, unsigned port)
 {
    (void)device;
    (void)port;
@@ -73,9 +73,8 @@ const input_driver_t input_null = {
    nullinput_input_key_pressed,
    nullinput_input_free_input,
 #ifdef RARCH_CONSOLE
-   nullinput_set_default_keybind_lut,
+   nullinput_set_default_keybinds,
    nullinput_set_analog_dpad_mapping,
-   2,
 #endif
    "null",
 };
diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c
index 72ba9fd50a..f634ec5b3a 100644
--- a/ps3/ps3_input.c
+++ b/ps3/ps3_input.c
@@ -427,7 +427,7 @@ static void ps3_input_free_input(void *data)
    //cellPadEnd();
 }
 
-static void ps3_set_default_keybind_lut(unsigned device, unsigned port)
+static void ps3_set_default_keybinds(unsigned device, unsigned port)
 {
    (void)device;
 
@@ -449,7 +449,7 @@ static void* ps3_input_init(void)
 #endif
 
    for(unsigned i = 0; i < MAX_PLAYERS; i++)
-      ps3_set_default_keybind_lut(0, i);
+      ps3_set_default_keybinds(0, i);
 
    for (unsigned i = 0; i < MAX_PADS; i++)
       ps3_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i);
@@ -468,7 +468,7 @@ const input_driver_t input_ps3 = {
    .input_state = ps3_input_state,
    .key_pressed = ps3_input_key_pressed,
    .free = ps3_input_free_input,
-   .set_default_keybind_lut = ps3_set_default_keybind_lut,
+   .set_default_keybinds = ps3_set_default_keybinds,
    .set_analog_dpad_mapping = ps3_input_set_analog_dpad_mapping,
    .ident = "ps3",
 };
diff --git a/psp/psp_input.c b/psp/psp_input.c
index d0c345b67a..3cfa346b38 100644
--- a/psp/psp_input.c
+++ b/psp/psp_input.c
@@ -151,7 +151,7 @@ static void psp_free_input(void *data)
    (void)data;
 }
 
-static void psp_set_default_keybind_lut(unsigned device, unsigned port)
+static void psp_set_default_keybinds(unsigned device, unsigned port)
 {
    (void)device;
 
@@ -171,7 +171,7 @@ static void* psp_input_initialize(void)
    sceCtrlSetSamplingMode(DEFAULT_SAMPLING_MODE);
 
    for(unsigned i = 0; i < MAX_PLAYERS; i++)
-      psp_set_default_keybind_lut(0, i);
+      psp_set_default_keybinds(0, i);
 
    return (void*)-1;
 }
@@ -196,7 +196,7 @@ const input_driver_t input_psp = {
    .input_state = psp_input_state,
    .key_pressed = psp_key_pressed,
    .free = psp_free_input,
-   .set_default_keybind_lut = psp_set_default_keybind_lut,
+   .set_default_keybinds = psp_set_default_keybinds,
    .set_analog_dpad_mapping = psp_input_set_analog_dpad_mapping,
    .ident = "psp",
 };
diff --git a/xdk/xdk_xinput_input.c b/xdk/xdk_xinput_input.c
index f088db5cd6..305aaf68f2 100644
--- a/xdk/xdk_xinput_input.c
+++ b/xdk/xdk_xinput_input.c
@@ -269,7 +269,7 @@ static void xdk_input_free_input(void *data)
    (void)data;
 }
 
-static void xdk_set_default_keybind_lut(unsigned device, unsigned port)
+static void xdk_set_default_keybinds(unsigned device, unsigned port)
 {
    (void)device;
 
@@ -335,7 +335,7 @@ static void *xdk_input_init(void)
 #endif
 
    for(unsigned i = 0; i < MAX_PLAYERS; i++)
-      xdk_set_default_keybind_lut(0, i);
+      xdk_set_default_keybinds(0, i);
 
    for(unsigned i = 0; i < MAX_PADS; i++)
       xdk_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i);
@@ -355,7 +355,7 @@ const input_driver_t input_xinput =
    xdk_input_state,
    xdk_input_key_pressed,
    xdk_input_free_input,
-   xdk_set_default_keybind_lut,
+   xdk_set_default_keybinds,
    xdk_input_set_analog_dpad_mapping,
    "xinput"
 };
diff --git a/xenon/xenon360_input.c b/xenon/xenon360_input.c
index 511dffbd8a..3d78c94bb9 100644
--- a/xenon/xenon360_input.c
+++ b/xenon/xenon360_input.c
@@ -82,7 +82,7 @@ static void xenon360_input_free_input(void *data)
    (void)data;
 }
 
-static void xenon360_input_set_default_keybind_lut(unsigned device, unsigned port)
+static void xenon360_input_set_default_keybinds(unsigned device, unsigned port)
 {
    (void)device;
 
@@ -105,7 +105,7 @@ static void xenon360_input_set_analog_dpad_mapping(unsigned device, unsigned map
 static void* xenon360_input_init(void)
 {
    for(unsigned i = 0; i < MAX_PLAYERS; i++)
-      xenon360_input_set_default_keybind_lut(0, i);
+      xenon360_input_set_default_keybinds(0, i);
 
    for(unsigned i = 0; i < MAX_PADS; i++)
       xenon360_input_set_analog_dpad_mapping(0, g_settings.input.dpad_emulation[i], i);
@@ -125,7 +125,7 @@ const input_driver_t input_xenon360 = {
    .input_state = xenon360_input_state,
    .key_pressed = xenon360_input_key_pressed,
    .free = xenon360_input_free_input,
-   .set_default_keybind_lut = xenon360_input_set_default_keybind_lut,
+   .set_default_keybinds = xenon360_input_set_default_keybinds,
    .set_analog_dpad_mapping = xenon360_input_set_analog_dpad_mapping,
    .ident = "xenon360",
 };