1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp b/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
index 6a058cb49a..91ffa990c4 100644
--- a/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
@@ -41,8 +41,9 @@
 namespace QmlDesigner {
 
 BindingEditorWidget::BindingEditorWidget()
-    : m_context(new BindingEditorContext(this))
+    : m_context(new Core::IContext(this))
 {
+    m_context->setWidget(this);
     Core::ICore::addContextObject(m_context);
 
     const Core::Context context(BINDINGEDITOR_CONTEXT_ID);
@@ -68,9 +69,6 @@ BindingEditorWidget::BindingEditorWidget()
 BindingEditorWidget::~BindingEditorWidget()
 {
     unregisterAutoCompletion();
-
-    Core::ICore::removeContextObject(m_context);
-    delete m_context;
 }
 
 void BindingEditorWidget::unregisterAutoCompletion()
@@ -136,6 +134,7 @@ BindingEditorFactory::BindingEditorFactory()
 {
     setId(BINDINGEDITOR_CONTEXT_ID);
     setDisplayName(QCoreApplication::translate("OpenWith::Editors", QmlDesigner::BINDINGEDITOR_CONTEXT_ID));
+    setEditorActionHandlers(0);
 
     setDocumentCreator([]() { return new BindingDocument; });
     setEditorWidgetCreator([]() { return new BindingEditorWidget; });