diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index 44056939d842..ee72bf2d8dbf 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -264,4 +264,6 @@
   <patch.extension implementation="com.intellij.openapi.diff.impl.patch.CharsetEP"/>
 
   <iconLayerProvider implementation="com.intellij.ide.LockedIconLayerProvider"/>
+
+  <xmlRpcHandler name="fileOpener" implementation="com.intellij.ide.OpenFileXmlRpcHandler"/>
 </extensions>
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index 5355ffbc6da3..72ef62dedb26 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -332,8 +332,6 @@
     <exportable serviceInterface="com.intellij.profile.codeInspection.InspectionProfileManager"/>
     <schemeOwner serviceInterface="com.intellij.profile.codeInspection.InspectionProfileManager"/>
 
-    <xmlRpcHandler name="fileOpener" implementation="com.intellij.ide.OpenFileXmlRpcHandler"/>
-
     <!-- File Exclusions -->
     <!--
     <projectService serviceInterface="com.intellij.openapi.file.exclude.ProjectFileExclusionManager"