diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hints/PopupActions.kt b/platform/lang-impl/src/com/intellij/codeInsight/hints/PopupActions.kt
index 3cf00c35b7d6..e8da4e201546 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hints/PopupActions.kt
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/PopupActions.kt
@@ -73,10 +73,14 @@ class BlacklistCurrentMethodAction : AnAction() {
 class ToggleInlineHintsAction : AnAction() {
 
   override fun update(e: AnActionEvent) {
-    e.presentation.isEnabled = true
-
-    val isShow = EditorSettingsExternalizable.getInstance().isShowParameterNameHints
-    e.presentation.text = if (isShow) "Disable Parameter Name Hints" else "Enable Parameter Name Hints"
+    if (InlayParameterHintsExtension.hasAnyExtensions()) {
+      e.presentation.isEnabledAndVisible = true
+      val isShow = EditorSettingsExternalizable.getInstance().isShowParameterNameHints
+      e.presentation.text = if (isShow) "Disable Parameter Name Hints" else "Enable Parameter Name Hints"
+    }
+    else {
+      e.presentation.isEnabledAndVisible = false      
+    }
   }
 
   override fun actionPerformed(e: AnActionEvent) {
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index c5b673ed09a8..f32e0526ba96 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -302,9 +302,12 @@
     <group id="ParameterNameHints" popup="true">
       <action id="BlacklistCurrentMethodAction" class="com.intellij.codeInsight.hints.BlacklistCurrentMethodAction"/>
       <action id="ShowParameterHintsSettings" class="com.intellij.codeInsight.hints.ShowParameterHintsSettings"/>
-      <action id="ToggleInlineHintsAction" class="com.intellij.codeInsight.hints.ToggleInlineHintsAction"/>
     </group>
     
+    <action id="ToggleInlineHintsAction" class="com.intellij.codeInsight.hints.ToggleInlineHintsAction">
+      <add-to-group group-id="EditorPopupMenu"/>
+    </action>
+    
     <!-- Analyze -->
     <action id="SliceBackward" class="com.intellij.slicer.SliceBackwardAction"/>
     <action id="SliceForward" class="com.intellij.slicer.SliceForwardAction"/>