diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
index 01d5d8fe6d0..6da9616e43f 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
@@ -246,7 +246,7 @@ void ClangDiagnosticConfigsWidget::syncConfigChooserToModel(const Core::Id &conf
 {
     disconnectConfigChooserCurrentIndex();
 
-    m_ui->configChooserComboBox->clear();
+    m_ui->configChooserList->clear();
     m_selectedConfigIndex = std::max(std::min(m_selectedConfigIndex,
                                               m_diagnosticConfigsModel.size() - 1),
                                      0);
@@ -256,7 +256,7 @@ void ClangDiagnosticConfigsWidget::syncConfigChooserToModel(const Core::Id &conf
         const ClangDiagnosticConfig &config = m_diagnosticConfigsModel.at(i);
         const QString displayName
                 = ClangDiagnosticConfigsModel::displayNameWithBuiltinIndication(config);
-        m_ui->configChooserComboBox->addItem(displayName, config.id().toSetting());
+        m_ui->configChooserList->addItem(displayName);
 
         if (configToSelect == config.id())
             m_selectedConfigIndex = i;
@@ -264,7 +264,7 @@ void ClangDiagnosticConfigsWidget::syncConfigChooserToModel(const Core::Id &conf
 
     connectConfigChooserCurrentIndex();
 
-    m_ui->configChooserComboBox->setCurrentIndex(m_selectedConfigIndex);
+    m_ui->configChooserList->setCurrentRow(m_selectedConfigIndex);
 }
 
 void ClangDiagnosticConfigsWidget::syncOtherWidgetsToComboBox()
@@ -372,7 +372,7 @@ void ClangDiagnosticConfigsWidget::updateConfig(const ClangDiagnosticConfig &con
 
 bool ClangDiagnosticConfigsWidget::isConfigChooserEmpty() const
 {
-    return m_ui->configChooserComboBox->count() == 0;
+    return m_ui->configChooserList->count() == 0;
 }
 
 void ClangDiagnosticConfigsWidget::setDiagnosticOptions(const QString &options)
@@ -441,17 +441,13 @@ void ClangDiagnosticConfigsWidget::connectClazyRadioButtonClicked(QRadioButton *
 
 void ClangDiagnosticConfigsWidget::connectConfigChooserCurrentIndex()
 {
-    connect(m_ui->configChooserComboBox,
-            static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-            this,
+    connect(m_ui->configChooserList, &QListWidget::currentRowChanged, this,
             &ClangDiagnosticConfigsWidget::onCurrentConfigChanged);
 }
 
 void ClangDiagnosticConfigsWidget::disconnectConfigChooserCurrentIndex()
 {
-    disconnect(m_ui->configChooserComboBox,
-               static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-               this,
+    disconnect(m_ui->configChooserList, &QListWidget::currentRowChanged, this,
                &ClangDiagnosticConfigsWidget::onCurrentConfigChanged);
 }
 
diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.ui b/src/plugins/cpptools/clangdiagnosticconfigswidget.ui
index d52c6af4f8b..cb9ef98a3cb 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigswidget.ui
+++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.ui
@@ -15,33 +15,46 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
-      <widget class="QComboBox" name="configChooserComboBox">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
+      <widget class="QListWidget" name="configChooserList"/>
      </item>
      <item>
-      <widget class="QPushButton" name="copyButton">
-       <property name="text">
-        <string>Copy...</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="removeButton">
-       <property name="text">
-        <string>Remove</string>
-       </property>
-      </widget>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QPushButton" name="copyButton">
+         <property name="text">
+          <string>Copy...</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="removeButton">
+         <property name="text">
+          <string>Remove</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout"/>
+   </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
@@ -82,11 +95,6 @@
    </item>
   </layout>
  </widget>
- <tabstops>
-  <tabstop>configChooserComboBox</tabstop>
-  <tabstop>copyButton</tabstop>
-  <tabstop>removeButton</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>