diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
index 31e72dcaeb7..03d5b10f977 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -346,6 +346,8 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result)
 
 void QmlProfilerClientManager::qmlComplete(qint64 maximumTime)
 {
+    if (d->profilerState->currentState() == QmlProfilerStateManager::AppStopRequested)
+        d->profilerState->setCurrentState(QmlProfilerStateManager::Idle);
     d->modelManager->traceTime()->increaseEndTime(maximumTime);
     if (d->modelManager && !d->aggregateTraces)
         d->modelManager->acquiringDone();
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index dec45639a00..d11f22e411d 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -780,8 +780,6 @@ void QmlProfilerTool::profilerDataModelStateChanged()
         setButtonsEnabled(false);
         break;
     case QmlProfilerModelManager::Done :
-        if (d->m_profilerState->currentState() == QmlProfilerStateManager::AppStopRequested)
-            d->m_profilerState->setCurrentState(QmlProfilerStateManager::Idle);
         showSaveOption();
         updateTimeDisplay();
         d->m_recordButton->setEnabled(true);