diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index d6ade734244..5f17c3ecebd 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -372,6 +372,7 @@ Action *ActionManagerPrivate::overridableAction(const Id &id)
         m_mainWnd->addAction(a->action());
         a->action()->setObjectName(id);
         a->action()->setShortcutContext(Qt::ApplicationShortcut);
+        a->setCurrentContext(m_context);
     }
 
     return a;
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index e8ac5d3ed65..e19e89e2554 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -468,6 +468,7 @@ void Action::addOverrideAction(QAction *action, const Core::Context &context, bo
         }
     }
     m_scriptableMap[action] = scriptable;
+    setCurrentContext(m_context);
 }
 
 void Action::removeOverrideAction(QAction *action)