diff --git a/input/input_config.c b/input/input_config.c
index 66958e7a04..da9cb16a37 100644
--- a/input/input_config.c
+++ b/input/input_config.c
@@ -83,6 +83,7 @@ static int input_config_pid[MAX_USERS];
 
 struct retro_keybind input_config_binds[MAX_USERS][RARCH_BIND_LIST_END];
 struct retro_keybind input_autoconf_binds[MAX_USERS][RARCH_BIND_LIST_END];
+const struct retro_keybind *libretro_input_binds[MAX_USERS];
 
 #define DECLARE_BIND(x, bind, desc) { true, 0, #x, desc, bind }
 #define DECLARE_META_BIND(level, x, bind, desc) { true, level, #x, desc, bind }
@@ -589,7 +590,8 @@ void input_config_reset(void)
    
    for (i = 0; i < MAX_USERS; i++)
    {
-      input_config_vid[i] = 0;
-      input_config_pid[i] = 0;
+      input_config_vid[i]     = 0;
+      input_config_pid[i]     = 0;
+      libretro_input_binds[i] = input_config_binds[i];
    }
 }
diff --git a/input/input_config.h b/input/input_config.h
index 600c077bde..930dcc4ed8 100644
--- a/input/input_config.h
+++ b/input/input_config.h
@@ -23,6 +23,7 @@
 
 extern struct retro_keybind input_config_binds[MAX_USERS][RARCH_BIND_LIST_END];
 extern struct retro_keybind input_autoconf_binds[MAX_USERS][RARCH_BIND_LIST_END];
+extern const struct retro_keybind *libretro_input_binds[MAX_USERS];
 
 const char *input_config_bind_map_get_base(unsigned i);
 
diff --git a/input/input_driver.c b/input/input_driver.c
index 64d9f337ed..95f7f61a48 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -260,7 +260,6 @@ float input_sensor_get_input(unsigned port, unsigned id)
    return 0.0f;
 }
 
-static const struct retro_keybind *libretro_input_binds[MAX_USERS];
 
 /**
  * input_poll:
@@ -279,7 +278,6 @@ void input_poll(void)
 
    for (i = 0; i < max_users; i++)
    {
-      libretro_input_binds[i]                 = input_config_binds[i];
       input_driver_turbo_btns.frame_enable[i] = 0;
 
       if (!input_driver_block_libretro_input && 
@@ -1019,8 +1017,6 @@ bool input_driver_init(void)
    unsigned i;
    settings_t *settings       = config_get_ptr();
 
-   for (i = 0; i < MAX_USERS; i++)
-      libretro_input_binds[i] = input_config_binds[i];
    if (current_input)
       current_input_data      = current_input->init(settings->input.joypad_driver);