diff --git a/platform/platform-resources/src/META-INF/xdebugger.xml b/platform/platform-resources/src/META-INF/xdebugger.xml
index f005c12074d6..4d1533f4a332 100644
--- a/platform/platform-resources/src/META-INF/xdebugger.xml
+++ b/platform/platform-resources/src/META-INF/xdebugger.xml
@@ -4,6 +4,10 @@
       <interface-class>com.intellij.xdebugger.XDebuggerManager</interface-class>
       <implementation-class>com.intellij.xdebugger.impl.XDebuggerManagerImpl</implementation-class>
     </component>
+
+    <component>
+      <implementation-class>com.intellij.xdebugger.memory.component.InstancesTracker</implementation-class>
+    </component>
   </project-components>
 
   <extensionPoints>
@@ -67,6 +71,7 @@
                          order="first" id="smart-step-into-enter"/>
     <editorActionHandler action="EditorEscape" implementationClass="com.intellij.xdebugger.impl.actions.handlers.XDebuggerSmartStepIntoHandler$EscHandler"
                          order="before hide-search" id="smart-step-into-escape"/>
+    <applicationService serviceImplementation="com.intellij.xdebugger.memory.component.MemoryViewManager"/>
   </extensions>
   
   <actions>
@@ -74,5 +79,18 @@
       <action id="XDebugger.AttachToProcess" class="com.intellij.xdebugger.impl.actions.AttachToProcessAction"/>
       <add-to-group group-id="RunMenu" anchor="before" relative-to-action="editRunConfigurations"/>
     </group>
+
+    <group id="MemoryView.SettingsPopupActionGroup">
+      <action class="com.intellij.xdebugger.memory.action.ShowClassesWithDiffAction"
+              id="MemoryView.ShowOnlyWithDiff"
+              text="Show Non-Zero Diff Only"/>
+
+      <separator/>
+
+      <action class="com.intellij.xdebugger.memory.action.SwitchUpdateModeAction"
+              id="MemoryView.SwitchUpdateMode"
+              text="Update Loaded Classes On Debugger Stop"
+              description="Load classes on debugger pause (may increase overhead on debugger stepping)"/>
+    </group>
   </actions>
 </idea-plugin>
diff --git a/resources/src/componentSets/Debugger.xml b/resources/src/componentSets/Debugger.xml
index 47e6efc817fa..0a70aeeb4249 100644
--- a/resources/src/componentSets/Debugger.xml
+++ b/resources/src/componentSets/Debugger.xml
@@ -17,13 +17,6 @@
       <option name="workspace" value="true"/>
       <loadForDefaultProject/>
     </component>
-
-    <component>
-      <implementation-class>com.intellij.xdebugger.memory.component.InstancesTracker</implementation-class>
-    </component>
   </project-components>
 
-  <extensions defaultExtensionNs="com.intellij">
-    <applicationService serviceImplementation="com.intellij.xdebugger.memory.component.MemoryViewManager"/>
-  </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index 3cc5967f0148..ef2e766b7a16 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -577,30 +577,23 @@
                     relative-to-action="XDebugger.JumpToTypeSource"/>
     </action>
 
-    <group id="MemoryView.SettingsPopupActionGroup">
-      <action class="com.intellij.debugger.memory.action.ShowClassesWithInstanceAction"
-              id="MemoryView.ShowOnlyWithInstances"
-              text="Show With Instances Only"/>
+    <action class="com.intellij.debugger.memory.action.ShowClassesWithInstanceAction"
+            id="MemoryView.ShowOnlyWithInstances"
+            text="Show With Instances Only">
+      <add-to-group group-id="MemoryView.SettingsPopupActionGroup" anchor="before" relative-to-action="MemoryView.ShowOnlyWithDiff"/>
+    </action>
 
-      <action class="com.intellij.xdebugger.memory.action.ShowClassesWithDiffAction"
-              id="MemoryView.ShowOnlyWithDiff"
-              text="Show Non-Zero Diff Only"/>
+    <action class="com.intellij.debugger.memory.action.ShowTrackedAction"
+            id="MemoryView.ShowOnlyTracked"
+            text="Show Tracked Classes Only">
+      <add-to-group group-id="MemoryView.SettingsPopupActionGroup" anchor="after" relative-to-action="MemoryView.ShowOnlyWithDiff"/>
+    </action>
 
-      <action class="com.intellij.debugger.memory.action.ShowTrackedAction"
-              id="MemoryView.ShowOnlyTracked"
-              text="Show Tracked Classes Only"/>
-
-      <separator/>
-
-      <action class="com.intellij.debugger.memory.action.EnableBackgroundTrackingAction"
-              id="MemoryView.EnableTrackingWithClosedWindow"
-              text="Enable Tracking With Hidden Memory View"/>
-
-      <action class="com.intellij.xdebugger.memory.action.SwitchUpdateModeAction"
-              id="MemoryView.SwitchUpdateMode"
-              text="Update Loaded Classes On Debugger Stop"
-              description="Load classes on debugger pause (may increase overhead on debugger stepping)"/>
-    </group>
+    <action class="com.intellij.debugger.memory.action.EnableBackgroundTrackingAction"
+            id="MemoryView.EnableTrackingWithClosedWindow"
+            text="Enable Tracking With Hidden Memory View">
+      <add-to-group group-id="MemoryView.SettingsPopupActionGroup" anchor="before" relative-to-action="MemoryView.SwitchUpdateMode"/>
+    </action>
 
     <group id="MemoryView.ClassesPopupActionGroup">
       <action class="com.intellij.debugger.memory.action.ShowInstancesFromClassesViewAction"