diff --git a/frontend/frontend.c b/frontend/frontend.c
index 85164beb62..a37c0c1d5f 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -65,37 +65,12 @@ static bool libretro_install_core(const char *path_prefix,
    return true;
 }
 
-static void input_defaults_console(void)
+static void input_default_binds_console(void)
 {
   for(unsigned i = 0; i < MAX_PLAYERS; i++)
       if (driver.input->set_keybinds)
-         driver.input->set_keybinds(driver.input_data, 0, i, 0,
+         driver.input->set_keybinds(driver.input_data, g_settings.input.device[i], i, 0,
                (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS));
-
-   for(unsigned i = 0; i < MAX_PADS; i++)
-   {
-      unsigned keybind_action = 0;
-
-      switch (g_settings.input.dpad_emulation[i])
-      {
-         case ANALOG_DPAD_LSTICK:
-            keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_LSTICK);
-            break;
-         case ANALOG_DPAD_RSTICK:
-            keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_RSTICK);
-            break;
-         case ANALOG_DPAD_NONE:
-            keybind_action = (1ULL << KEYBINDS_ACTION_SET_ANALOG_DPAD_NONE);
-            break;
-         default:
-            break;
-      }
-
-      if (keybind_action)
-         if (driver.input->set_keybinds)
-            driver.input->set_keybinds(driver.input_data, 0, i, 0,
-                  keybind_action);
-   }
 }
 
 static void rarch_get_environment_console(void)
@@ -104,7 +79,7 @@ static void rarch_get_environment_console(void)
    rarch_init_system_info();
 
    global_init_drivers();
-   input_defaults_console();
+   input_default_binds_console();
 
 #ifdef HAVE_LIBRETRO_MANAGEMENT
    char path_prefix[PATH_MAX];