diff --git a/src/plugins/projectexplorer/targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp
index cc5257fabcc..432abb53b40 100644
--- a/src/plugins/projectexplorer/targetsetupwidget.cpp
+++ b/src/plugins/projectexplorer/targetsetupwidget.cpp
@@ -276,6 +276,7 @@ void TargetSetupWidget::updateDefaultBuildDirectories()
     for (const BuildInfo &buildInfo : buildInfoList(m_kit, m_projectPath)) {
         if (!buildInfo.factory())
             continue;
+        bool found = false;
         for (BuildInfoStore &buildInfoStore : m_infoStore) {
             if (buildInfoStore.buildInfo.typeName == buildInfo.typeName) {
                 if (!buildInfoStore.customBuildDir) {
@@ -283,9 +284,12 @@ void TargetSetupWidget::updateDefaultBuildDirectories()
                     buildInfoStore.pathChooser->setFileName(buildInfo.buildDirectory);
                     m_ignoreChange = false;
                 }
+                found = true;
                 break;
             }
         }
+        if (!found)  // the change of the kit may have produced more build information than before
+            addBuildInfo(buildInfo, false);
     }
 }