diff --git a/src/plugins/designer/designerxmleditorwidget.cpp b/src/plugins/designer/designerxmleditorwidget.cpp
index 3cc41addc612b150df2504eb911635300081c407..291b60173d2f92614d90d057700e25aee2e153f4 100644
--- a/src/plugins/designer/designerxmleditorwidget.cpp
+++ b/src/plugins/designer/designerxmleditorwidget.cpp
@@ -42,8 +42,8 @@ DesignerXmlEditorWidget::DesignerXmlEditorWidget(QDesignerFormWindowInterface *f
 {
     TextEditor::BaseTextDocumentPtr doc(new FormWindowFile(form));
     setTextDocument(doc);
-    auto editor = new FormWindowEditor(this);
-    editor->setEditorWidget(this);
+    m_editor = new FormWindowEditor(this);
+    m_editor->setEditorWidget(this);
     setupAsPlainEditor();
     setReadOnly(true);
     configureMimeType(doc->mimeType());
@@ -51,7 +51,7 @@ DesignerXmlEditorWidget::DesignerXmlEditorWidget(QDesignerFormWindowInterface *f
 
 FormWindowEditor *DesignerXmlEditorWidget::designerEditor() const
 {
-    return qobject_cast<FormWindowEditor *>(editor());
+    return m_editor;
 }
 
 Internal::FormWindowFile *DesignerXmlEditorWidget::formWindowFile() const
diff --git a/src/plugins/designer/designerxmleditorwidget.h b/src/plugins/designer/designerxmleditorwidget.h
index c66872994b98d02c96f9fd7c4f6509c77e020b50..e1e2c98f87705fc3d01ac663ea8c2c98f236d992 100644
--- a/src/plugins/designer/designerxmleditorwidget.h
+++ b/src/plugins/designer/designerxmleditorwidget.h
@@ -61,6 +61,9 @@ public:
 
     FormWindowEditor *designerEditor() const;
     Internal::FormWindowFile *formWindowFile() const;
+
+private:
+    FormWindowEditor *m_editor;
 };
 
 } // Internal
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index e4c2e7dfe76cf7397013bf4c4627769be28ca61e..47d5e2dca26c2e6cdde07b5f63812906d21d763f 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -641,7 +641,7 @@ EditorData FormEditorW::createEditor()
             resourceHandler, SLOT(updateResources()));
     m_editorWidget->add(data);
 
-    m_toolBar->addEditor(xmlEditor->editor());
+    m_toolBar->addEditor(xmlEditor->designerEditor());
 
     return data;
 }