diff --git a/configuration.c b/configuration.c
index 9df54d2a9d..89ddae6af4 100644
--- a/configuration.c
+++ b/configuration.c
@@ -2495,7 +2495,7 @@ void config_set_defaults(void *data)
       settings->uints.input_analog_dpad_mode[i] = ANALOG_DPAD_NONE;
 #endif
       input_config_set_device(i, RETRO_DEVICE_JOYPAD);
-      settings->uints.input_mouse_index[i] = 0;
+      settings->uints.input_mouse_index[i] = i;
    }
 
    video_driver_reset_custom_viewport();
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 3120b6a750..e0fba1629f 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -7072,7 +7072,7 @@ static int setting_action_start_mouse_index(rarch_setting_t *setting)
    if (!setting)
       return -1;
 
-   settings->uints.input_mouse_index[setting->index_offset] = 0;
+   settings->uints.input_mouse_index[setting->index_offset] = setting->index_offset;
    settings->modified = true;
    return 0;
 }
@@ -8473,7 +8473,7 @@ static bool setting_append_list_input_player_options(
             &settings->uints.input_mouse_index[user],
             mouse_index[user],
             label_mouse_index[user],
-            0,
+            user,
             &group_info,
             &subgroup_info,
             parent_group,