diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index 664cbef66f4..471977eee67 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -624,14 +624,13 @@ void ExternalToolRunner::started()
 
 void ExternalToolRunner::finished(int exitCode, QProcess::ExitStatus status)
 {
-    if (status == QProcess::NormalExit && exitCode == 0) {
-        if (m_tool->outputHandling() == ExternalTool::ReplaceSelection
-                || m_tool->errorHandling() == ExternalTool::ReplaceSelection) {
-            emit ExternalToolManager::instance()->replaceSelectionRequested(m_processOutput);
-        }
-        if (m_tool->modifiesCurrentDocument())
-            DocumentManager::unexpectFileChange(m_expectedFileName);
+    if (status == QProcess::NormalExit && exitCode == 0
+            &&  (m_tool->outputHandling() == ExternalTool::ReplaceSelection
+                 || m_tool->errorHandling() == ExternalTool::ReplaceSelection)) {
+        emit ExternalToolManager::instance()->replaceSelectionRequested(m_processOutput);
     }
+    if (m_tool->modifiesCurrentDocument())
+        DocumentManager::unexpectFileChange(m_expectedFileName);
     ICore::messageManager()->printToOutputPane(
                 tr("'%1' finished").arg(m_resolvedExecutable), MessageManager::Silent);
     deleteLater();