diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 31e2ec2a7054913529fb6a565c35fec7c5e97d97..d65636d6212efe2c70f3f82378678f2b6eae57b3 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -261,7 +261,7 @@
 //                         |        |                                        
 //                         |        |                                        
 //                    {notify-   {notify-                                    
-//                    Inferior-  Inferior-                                   
+//                     Engine-    Engine-
 //                  ShutdownOk}  ShutdownFailed}                             
 //                         +       +                                         
 //            EngineShutdownOk  EngineShutdownFailed                         
@@ -2214,10 +2214,11 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
     const bool isContinuable = (engine->state() == InferiorStopOk);
     const bool isInterruptible = (engine->state() == InferiorRunOk);
     ICore *core = ICore::instance();
+
     if (isContinuable) {
-        core->updateAdditionalContexts(Core::Context(), m_continuableContext);
+        core->updateAdditionalContexts(m_interruptibleContext, m_continuableContext);
     } else if (isInterruptible) {
-        core->updateAdditionalContexts(Core::Context(), m_interruptibleContext);
+        core->updateAdditionalContexts(m_continuableContext, m_interruptibleContext);
     } else {
         core->updateAdditionalContexts(m_continuableContext, Core::Context());
         core->updateAdditionalContexts(m_interruptibleContext, Core::Context());