diff --git a/platform/analysis-api/resources/META-INF/analysis-api.xml b/platform/analysis-api/resources/META-INF/analysis-api.xml
index db12c443c8a5..904f1da7e131 100644
--- a/platform/analysis-api/resources/META-INF/analysis-api.xml
+++ b/platform/analysis-api/resources/META-INF/analysis-api.xml
@@ -5,6 +5,9 @@
     <extensionPoint name="completion.contributor" beanClass="com.intellij.codeInsight.completion.CompletionContributorEP">
       <with attribute="implementationClass" implements="com.intellij.codeInsight.completion.CompletionContributor"/>
     </extensionPoint>
+
+    <extensionPoint name="gotoDeclarationHandler" dynamic="true"
+                    interface="com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler"/>
   </extensionPoints>
   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceImplementation="com.intellij.psi.search.scope.packageSet.NamedScopeManager"/>
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index 03f589ede95c..ad0ebb454af8 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -350,7 +350,6 @@
       <with attribute="implementationClass" implements="com.intellij.codeInsight.hint.ImplementationTextProcessor"/>
     </extensionPoint>
 
-    <extensionPoint name="gotoDeclarationHandler" interface="com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler" dynamic="true"/>
     <extensionPoint name="typeDeclarationProvider" interface="com.intellij.codeInsight.navigation.actions.TypeDeclarationProvider" dynamic="true"/>
     <extensionPoint name="gotoTargetRendererProvider" interface="com.intellij.codeInsight.navigation.GotoTargetRendererProvider" dynamic="true"/>