diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 0915fe45c4365ee16719bc7adf08119b4ae827cb..e2442ae85cf3c74bb5714fb29db03dd92e6e36b3 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2265,7 +2265,10 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
     // This is only needed when we insist on using Shift-F5 for Interrupt.
     // Removing the block makes F5 interrupt when running and continue when stopped.
     Core::ActionManager *am = core->actionManager();
-    if (m_state == InferiorStopOk || m_state == InferiorUnrunnable) {
+    bool stopIsKill = m_state == InferiorStopOk
+        || m_state == InferiorUnrunnable
+        || m_state == DebuggerFinished;
+    if (stopIsKill) {
         am->command(Constants::STOP)->setKeySequence(QKeySequence(STOP_KEY));
         am->command(PE::DEBUG)->setKeySequence(QKeySequence("F5"));
     } else {