diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 2157c62e237..e2e1715b6ce 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -251,7 +251,14 @@ GenericBuildSystem::GenericBuildSystem(Target *target)
     connect(&m_deployFileWatcher, &FileSystemWatcher::fileChanged,
             this, &GenericBuildSystem::updateDeploymentData);
 
-    connect(target, &Target::activeBuildConfigurationChanged, this, [this] { refresh(Everything); });
+    connect(target, &Target::activeBuildConfigurationChanged, this, [this, target] {
+        if (target == project()->activeTarget())
+            refresh(Everything);
+    });
+    connect(project(), &Project::activeTargetChanged, this, [this, target] {
+        if (target == project()->activeTarget())
+            refresh(Everything);
+    });
 }
 
 GenericBuildSystem::~GenericBuildSystem()
@@ -553,6 +560,8 @@ void GenericBuildSystem::refreshCppCodeModel()
 {
     if (!m_cppCodeModelUpdater)
         return;
+    if (target() != project()->activeTarget())
+        return;
     QtSupport::CppKitInfo kitInfo(kit());
     QTC_ASSERT(kitInfo.isValid(), return);