diff --git a/general.h b/general.h
index bf99ee8e98..76cfb71c5b 100644
--- a/general.h
+++ b/general.h
@@ -352,7 +352,7 @@ struct settings
       unsigned analog_dpad_mode[MAX_PLAYERS];
 
       float axis_threshold;
-      int joypad_map[MAX_PLAYERS];
+      unsigned joypad_map[MAX_PLAYERS];
       unsigned device[MAX_PLAYERS];
       char device_names[MAX_PLAYERS][64];
       bool autodetect_enable;
diff --git a/settings_data.c b/settings_data.c
index 2cb4615f09..13d9b90ce4 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -4296,11 +4296,11 @@ static bool setting_data_append_list_input_options(
                "input_player%d_joypad_index", player + 1);
       snprintf(label[player], sizeof(label[player]),
                "Player %d Pad Index", player + 1);
-      CONFIG_INT(
+      CONFIG_UINT(
             g_settings.input.joypad_map[player],
             key[player],
             label[player],
-            0,
+            player,
             group_info.name,
             subgroup_info.name,
             general_write_handler,