3 files changed, 3 insertions, 17 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index bfed2d038..f8fae7416 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -212,16 +212,11 @@ void Config::ReadPlayerValue(std::size_t player_index) {
     }
 
     if (player_prefix.isEmpty() && Settings::IsConfiguringGlobal()) {
-        const auto controller = static_cast<Settings::ControllerType>(
+        player.controller_type = static_cast<Settings::ControllerType>(
             qt_config
                 ->value(QStringLiteral("%1type").arg(player_prefix),
                         static_cast<u8>(Settings::ControllerType::ProController))
                 .toUInt());
-
-        if (controller == Settings::ControllerType::LeftJoycon ||
-            controller == Settings::ControllerType::RightJoycon) {
-            player.controller_type = controller;
-        }
     } else {
         player.connected =
             ReadSetting(QStringLiteral("%1connected").arg(player_prefix), player_index == 0)
diff --git a/src/yuzu/configuration/configure_input_per_game.cpp b/src/yuzu/configuration/configure_input_per_game.cpp
index 78e65d468..4e77fe00b 100644
--- a/src/yuzu/configuration/configure_input_per_game.cpp
+++ b/src/yuzu/configuration/configure_input_per_game.cpp
@@ -57,7 +57,7 @@ void ConfigureInputPerGame::ApplyConfiguration() {
 }
 
 void ConfigureInputPerGame::LoadConfiguration() {
-    static constexpr size_t HANDHELD_INDEX = 8;
+    static constexpr size_t HANDHELD_INDEX = 0;
 
     auto& hid_core = system.HIDCore();
     for (size_t player_index = 0; player_index < profile_comboboxes.size(); ++player_index) {
@@ -69,9 +69,6 @@ void ConfigureInputPerGame::LoadConfiguration() {
         const auto selection_index = player_combobox->currentIndex();
         if (selection_index == 0) {
             Settings::values.players.GetValue()[player_index].profile_name = "";
-            if (player_index == 0) {
-                Settings::values.players.GetValue()[HANDHELD_INDEX] = {};
-            }
             Settings::values.players.SetGlobal(true);
             emulated_controller->ReloadFromSettings();
             continue;
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index 50b62293e..93eb10ceb 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -1589,7 +1589,6 @@ void ConfigureInputPlayer::LoadProfile() {
 }
 
 void ConfigureInputPlayer::SaveProfile() {
-    static constexpr size_t HANDHELD_INDEX = 8;
     const QString profile_name = ui->comboProfiles->itemText(ui->comboProfiles->currentIndex());
 
     if (profile_name.isEmpty()) {
@@ -1598,12 +1597,7 @@ void ConfigureInputPlayer::SaveProfile() {
 
     ApplyConfiguration();
 
-    // When we're in handheld mode, only the handheld emulated controller bindings are updated
-    const bool is_handheld = player_index == 0 && emulated_controller->GetNpadIdType() ==
-                                                      Core::HID::NpadIdType::Handheld;
-    const auto profile_player_index = is_handheld ? HANDHELD_INDEX : player_index;
-
-    if (!profiles->SaveProfile(profile_name.toStdString(), profile_player_index)) {
+    if (!profiles->SaveProfile(profile_name.toStdString(), player_index)) {
         QMessageBox::critical(this, tr("Save Input Profile"),
                               tr("Failed to save the input profile \"%1\"").arg(profile_name));
         UpdateInputProfiles();