diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
index 55213d4f246..bb3d55c3cc3 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
@@ -157,10 +157,12 @@ void ClangDiagnosticConfigsWidget::syncConfigChooserToModel(const Core::Id &conf
 
     connectConfigChooserCurrentIndex();
 
-    if (configToSelectIndex != -1)
+    if (configToSelectIndex != -1) {
         m_ui->configChooserComboBox->setCurrentIndex(configToSelectIndex);
-    else if (previousCurrentIndex != m_ui->configChooserComboBox->currentIndex())
+    } else if (previousCurrentIndex != m_ui->configChooserComboBox->currentIndex()) {
+        syncOtherWidgetsToComboBox();
         emit currentConfigChanged(currentConfigId());
+    }
 }
 
 void ClangDiagnosticConfigsWidget::syncOtherWidgetsToComboBox()