1 files changed, 3 insertions, 1 deletions

diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index 76f55eb54..0254ea6fe 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -627,7 +627,8 @@ void ConfigureInputPlayer::UpdateInputDeviceCombobox() {
         return;
     }
 
-    const auto devices = emulated_controller->GetMappedDevices(Core::HID::DeviceIndex::AllDevices);
+    const auto devices =
+        emulated_controller->GetMappedDevices(Core::HID::EmulatedDeviceIndex::AllDevices);
     UpdateInputDevices();
 
     if (devices.empty()) {
@@ -846,6 +847,7 @@ void ConfigureInputPlayer::SetConnectableControllers() {
 
     if (!is_powered_on) {
         add_controllers(true);
+        return;
     }
 
     add_controllers(false, hid_core.GetSupportedStyleTag());