diff --git a/configuration.c b/configuration.c
index 25ed1671c583..fb9d83b5b888 100644
--- a/configuration.c
+++ b/configuration.c
@@ -5004,9 +5004,14 @@ bool config_save_autoconf_profile(const
    {
       const struct retro_keybind *bind = &input_config_binds[user][i];
       if (bind->valid)
-         input_config_save_keybind(
+      {
+         save_keybind_joykey(
+               conf, "input", input_config_bind_map_get_base(i),
+               bind, false);
+         save_keybind_axis(
                conf, "input", input_config_bind_map_get_base(i),
                bind, false);
+      }
    }
 
    ret = config_file_write(conf, autoconf_file, false);