diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
index 3ffe0081ff..0b6686a687 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
@@ -147,6 +147,8 @@ void MappingWidget::Update()
 
   for (auto* checkbox : m_bools)
     checkbox->Update();
+
+  SaveSettings();
 }
 
 ControllerEmu::EmulatedController* MappingWidget::GetController() const
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
index b87c027e01..d642f17f78 100644
--- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
@@ -216,7 +216,7 @@ void MappingWindow::OnSaveProfilePressed()
   m_controller->SaveConfig(ini.GetOrCreateSection("Profile"));
   ini.Save(profile_path);
 
-  if (m_profiles_combo->currentIndex() == 0)
+  if (m_profiles_combo->currentIndex() == 0 || m_profiles_combo->findText(profile_name) == -1)
   {
     m_profiles_combo->addItem(profile_name, QString::fromStdString(profile_path));
     m_profiles_combo->setCurrentIndex(m_profiles_combo->count() - 1);