diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 1aa77ae3ea3..b0ff79f5d1e 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -553,8 +553,10 @@ void DebuggerEnginePrivate::setupViews()
         = new Perspective(perspectiveId, m_engine->displayName(), parentPerspectiveId, settingsId);
 
     m_progress.setProgressRange(0, 1000);
-    FutureProgress *fp = ProgressManager::addTask(m_progress.future(),
-        Tr::tr("Launching Debugger"), "Debugger.Launcher");
+    const QString msg = m_companionEngines.isEmpty()
+            ? Tr::tr("Launching Debugger")
+            : Tr::tr("Launching %1 Debugger").arg(m_debuggerName);
+    FutureProgress *fp = ProgressManager::addTask(m_progress.future(), msg, "Debugger.Launcher");
     connect(fp, &FutureProgress::canceled, m_engine, &DebuggerEngine::quitDebugger);
     m_progress.reportStarted();
 
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 522191e25b3..5688ff191ad 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -543,11 +543,11 @@ void DebuggerRunTool::start()
     for (auto engine : m_engines) {
         engine->setRunParameters(m_runParameters);
         engine->setRunId(d->runId);
-        engine->setRunTool(this);
         for (auto companion : m_engines) {
             if (companion != engine)
                 engine->addCompanionEngine(companion);
         }
+        engine->setRunTool(this);
         if (!first)
             engine->setSecondaryEngine();
         auto rc = runControl();