diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index ceb531271a0..a83815a9b4f 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -268,8 +268,9 @@ sg1:   EngineSetupRequested -> EngineSetupOk [ label="notifyEngineSetupOk", styl
 sg1:   EngineSetupRequested -> EngineSetupFailed [ label= "notifyEngineSetupFailed", style="dashed"];
 sg1:   EngineSetupFailed -> DebuggerFinished [ label= "RunControl::StartFailed" ];
 sg1:   EngineSetupOk -> InferiorSetupRequested [ label= "RunControl::StartSuccessful" ];
+sg1:   InferiorSetupRequested -> InferiorSetupOk [ label="notifyInferiorSetupOk", style="dashed" ];
 sg1:   InferiorSetupRequested -> InferiorSetupFailed [ label="notifyInferiorFailed", style="dashed" ];
-sg1:   InferiorSetupRequested -> EngineRunRequested [ label="notifyInferiorSetupOk", style="dashed" ];
+sg1:   InferiorSetupOk -> EngineRunRequested
 sg1:   InferiorSetupFailed -> EngineShutdownRequested
 sg1:   EngineRunRequested -> InferiorUnrunnable [ label="notifyInferiorUnrunnable", style="dashed" ];
 sg1:   EngineRunRequested -> InferiorStopOk [ label="notifyEngineRunAndInferiorStopOk", style="dashed" ];
@@ -284,9 +285,12 @@ sg1:   InferiorStopOk -> InferiorRunRequested [ label="User\nEngine::continueInf
 sg1:   InferiorRunRequested -> InferiorRunOk [ label="notifyInferiorRunOk", style="dashed"];
 sg1:   InferiorRunRequested -> InferiorRunFailed [ label="notifyInferiorRunFailed", style="dashed"];
 sg1:   InferiorRunFailed -> InferiorStopOk
+sg1:   InferiorStopOk -> InferiorShutdownRequested [ label="Close event" ];
+sg1:   InferiorUnrunnable -> InferiorShutdownRequested [ label="Close event" ];
 sg1:   InferiorShutdownRequested -> InferiorShutdownOk [ label= "Engine::shutdownInferior\nnotifyInferiorShutdownOk", style="dashed" ];
 sg1:   InferiorShutdownRequested -> InferiorShutdownFailed [ label="Engine::shutdownInferior\nnotifyInferiorShutdownFailed", style="dashed" ];
-sg1:   InferiorExited -> InferiorShutdownOk [ label="notifyInferiorExited", style="dashed"];
+sg1:   InferiorExited -> InferiorExitOk [ label="notifyInferiorExited", style="dashed"];
+sg1:   InferiorExitOk -> InferiorShutdownOk
 sg1:   InferiorShutdownOk -> EngineShutdownRequested
 sg1:   InferiorShutdownFailed -> EngineShutdownRequested
 sg1:   EngineShutdownRequested -> EngineShutdownOk [ label="Engine::shutdownEngine\nnotifyEngineShutdownOk", style="dashed" ];