diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
index a306458dae8..93742a848e7 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
@@ -41,11 +41,23 @@ using namespace TextEditor;
 namespace GenericProjectManager {
 namespace Internal {
 
-////////////////////////////////////////////////////////////////////////////////////////
+//
+// ProjectFilesEditor
+//
+
+class ProjectFilesEditor : public BaseTextEditor
+{
+public:
+    ProjectFilesEditor()
+    {
+        addContext(Constants::C_FILESEDITOR);
+        setDuplicateSupported(true);
+    }
+};
+
 //
 // ProjectFilesFactory
 //
-////////////////////////////////////////////////////////////////////////////////////////
 
 ProjectFilesFactory::ProjectFilesFactory()
 {
@@ -54,27 +66,10 @@ ProjectFilesFactory::ProjectFilesFactory()
     addMimeType(Constants::FILES_MIMETYPE);
     addMimeType(Constants::INCLUDES_MIMETYPE);
     addMimeType(Constants::CONFIG_MIMETYPE);
-    new TextEditor::TextEditorActionHandler(this, Constants::C_FILESEDITOR);
-}
 
-Core::IEditor *ProjectFilesFactory::createEditor()
-{
-    return new ProjectFilesEditor;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////
-//
-// ProjectFilesEditor
-//
-////////////////////////////////////////////////////////////////////////////////////////
-
-ProjectFilesEditor::ProjectFilesEditor()
-{
-    addContext(Constants::C_FILESEDITOR);
-    setDuplicateSupported(true);
     setEditorCreator([]() { return new ProjectFilesEditor; });
-    setWidgetCreator([]() { return new BaseTextEditorWidget; });
     setDocumentCreator([]() { return new BaseTextDocument(Constants::FILES_EDITOR_ID); });
+    setEditorActionHandlers(Constants::C_FILESEDITOR, TextEditorActionHandler::None);
 }
 
 } // namespace Internal
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.h b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
index 190904f083d..9c98a03ae9b 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.h
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
@@ -32,23 +32,13 @@
 
 #include <texteditor/basetexteditor.h>
 
-#include <coreplugin/editormanager/ieditorfactory.h>
-
 namespace GenericProjectManager {
 namespace Internal {
 
-class ProjectFilesFactory: public Core::IEditorFactory
+class ProjectFilesFactory : public TextEditor::BaseTextEditorFactory
 {
 public:
     ProjectFilesFactory();
-
-    Core::IEditor *createEditor();
-};
-
-class ProjectFilesEditor : public TextEditor::BaseTextEditor
-{
-public:
-    ProjectFilesEditor();
 };
 
 } // namespace Internal