diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 76336d3aa13..40620f7a711 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -652,13 +652,13 @@ void BuildManager::addToOutputWindow(const QString &string, BuildStep::OutputFor
 void BuildManager::nextBuildQueue()
 {
     d->m_outputWindow->flush();
+    disconnectOutput(d->m_currentBuildStep);
+    decrementActiveBuildSteps(d->m_currentBuildStep);
+
     if (d->m_canceling) {
         d->m_canceling = false;
         QTimer::singleShot(0, m_instance, &BuildManager::emitCancelMessage);
 
-        disconnectOutput(d->m_currentBuildStep);
-        decrementActiveBuildSteps(d->m_currentBuildStep);
-
         //TODO NBS fix in qtconcurrent
         d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100,
                                                               Tr::tr("Build/Deployment canceled"));
@@ -666,11 +666,9 @@ void BuildManager::nextBuildQueue()
         return;
     }
 
-    disconnectOutput(d->m_currentBuildStep);
     if (!d->m_skipDisabled)
         ++d->m_progress;
     d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100, msgProgress(d->m_progress, d->m_maxProgress));
-    decrementActiveBuildSteps(d->m_currentBuildStep);
 
     const bool success = d->m_skipDisabled || d->m_lastStepSucceeded;
     if (success) {