diff --git a/plugins/editorconfig/src/META-INF/plugin.xml b/plugins/editorconfig/src/META-INF/plugin.xml
index 6710eb83855f..8d8ff18f3139 100644
--- a/plugins/editorconfig/src/META-INF/plugin.xml
+++ b/plugins/editorconfig/src/META-INF/plugin.xml
@@ -17,11 +17,6 @@
     <fileIndentOptionsProvider implementation="org.editorconfig.configmanagement.EditorConfigIndentOptionsProvider" />
     <editorNotificationProvider implementation="org.editorconfig.plugincomponents.EditorConfigNotifierProvider"/>
     <applicationService serviceInterface="org.editorconfig.plugincomponents.SettingsProviderComponent" serviceImplementation="org.editorconfig.plugincomponents.SettingsProviderComponent" />
+    <postStartupActivity implementation="org.editorconfig.plugincomponents.ConfigProjectComponent"/>
   </extensions>
-
-  <project-components>
-      <component>
-          <implementation-class>org.editorconfig.plugincomponents.ConfigProjectComponent</implementation-class>
-      </component>
-  </project-components>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java b/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java
index 436bc59cdd05..9a5c7dc1b96e 100644
--- a/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java
+++ b/plugins/editorconfig/src/org/editorconfig/plugincomponents/ConfigProjectComponent.java
@@ -1,12 +1,13 @@
 package org.editorconfig.plugincomponents;
 
 import com.intellij.AppTopics;
-import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.editor.ex.EditorEx;
+import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectRootManager;
+import com.intellij.openapi.startup.StartupActivity;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileAdapter;
@@ -18,10 +19,11 @@ import org.editorconfig.configmanagement.EncodingManager;
 import org.editorconfig.configmanagement.LineEndingsManager;
 import org.jetbrains.annotations.NotNull;
 
-public class ConfigProjectComponent implements ProjectComponent {
-
-  public ConfigProjectComponent(final Project project, final EditorFactory editorFactory) {
+public class ConfigProjectComponent implements StartupActivity, DumbAware {
+  @Override
+  public void runActivity(@NotNull Project project) {
     // Register project-level config managers
+    final EditorFactory editorFactory = EditorFactory.getInstance();
     MessageBus bus = project.getMessageBus();
     EditorSettingsManager editorSettingsManager = new EditorSettingsManager(project);
     EncodingManager encodingManager = new EncodingManager(project);
@@ -58,19 +60,4 @@ public class ConfigProjectComponent implements ProjectComponent {
       }
     }, project);
   }
-
-  public void initComponent() {
-  }
-
-  public void disposeComponent() {
-  }
-
-  @NotNull
-  public String getComponentName() {
-    return "ConfigProjectComponent";
-  }
-
-  public void projectOpened() {}
-
-  public void projectClosed() {}
 }