diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index cc2bcbfeb60..a46de056426 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -113,10 +113,10 @@ void CMakeBuildStep::handleBuildTargetChanges(bool success)
 {
     if (!success)
         return; // Do not change when parsing failed.
-    if (isCurrentExecutableTarget(m_buildTarget))
-        return; // Do not change just because a different set of build targets is there...
-    if (!static_cast<CMakeProject *>(project())->buildTargetTitles().contains(m_buildTarget))
+    if (!isCurrentExecutableTarget(m_buildTarget)
+        && !static_cast<CMakeProject *>(project())->buildTargetTitles().contains(m_buildTarget)) {
         setBuildTarget(allTarget());
+    }
     emit buildTargetsChanged();
 }