diff --git a/platform/platform-api/src/com/intellij/ui/docking/DockManager.java b/platform/platform-api/src/com/intellij/ui/docking/DockManager.java
index 9f995bd9b8fe..eab3420967a8 100644
--- a/platform/platform-api/src/com/intellij/ui/docking/DockManager.java
+++ b/platform/platform-api/src/com/intellij/ui/docking/DockManager.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.ui.docking;
 
-import com.intellij.openapi.components.ProjectComponent;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.IdeFrame;
 import org.jetbrains.annotations.NotNull;
@@ -25,13 +25,13 @@ import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.util.Set;
 
-public abstract class DockManager implements ProjectComponent {
+public abstract class DockManager {
 
   public abstract void register(DockContainer container);
   public abstract void register(String id, DockContainerFactory factory);
 
   public static DockManager getInstance(Project project) {
-    return project.getComponent(DockManager.class);
+    return ServiceManager.getService(project, DockManager.class);
   }
 
   public abstract DragSession createDragSession(MouseEvent mouseEvent, @NotNull DockableContent content);
diff --git a/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java b/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
index beeb6eada26b..6ee005f385f1 100644
--- a/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
@@ -200,28 +200,6 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo
     return myBusyObject.getReady(this);
   }
 
-  @Override
-  public void projectOpened() {
-  }
-
-  @Override
-  public void projectClosed() {
-  }
-
-  @NotNull
-  @Override
-  public String getComponentName() {
-    return "DockManager";
-  }
-
-  @Override
-  public void initComponent() {
-  }
-
-  @Override
-  public void disposeComponent() {
-  }
-
   private class MyDragSession implements DragSession {
 
     private final JWindow myWindow;
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index df50fa5a85a5..c3aa607e3183 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -154,6 +154,8 @@
     <projectService serviceInterface="com.intellij.ide.errorTreeView.impl.ErrorTreeViewConfiguration"
                     serviceImplementation="com.intellij.ide.errorTreeView.impl.ErrorTreeViewConfiguration"/>
 
+    <projectService serviceInterface="com.intellij.ui.docking.DockManager"
+                    serviceImplementation="com.intellij.ui.docking.impl.DockManagerImpl"/>
     <projectService serviceInterface="com.intellij.ide.SelectInEditorManager"
                     serviceImplementation="com.intellij.ide.impl.SelectInEditorManagerImpl"/>
     <projectService serviceInterface="com.intellij.ui.RecentsManager"
diff --git a/platform/platform-resources/src/componentSets/Platform.xml b/platform/platform-resources/src/componentSets/Platform.xml
index 894747376d5c..0a04f5117126 100644
--- a/platform/platform-resources/src/componentSets/Platform.xml
+++ b/platform/platform-resources/src/componentSets/Platform.xml
@@ -163,11 +163,6 @@
       <loadForDefaultProject/>
     </component>
 
-    <component>
-      <interface-class>com.intellij.ui.docking.DockManager</interface-class>
-      <implementation-class>com.intellij.ui.docking.impl.DockManagerImpl</implementation-class>
-    </component>
-
     <component>
       <implementation-class>com.intellij.notification.impl.NotificationsManagerImpl$ProjectNotificationsComponent</implementation-class>
       <skipForDefaultProject/>