diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index fb8ef0e7fa740..27692b25875d8 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -23,7 +23,7 @@
       <group id="GenerateFromTestCreatorsGroup" class="com.intellij.testIntegration.GenerateFromTestCreatorsGroup"/>
     </group>
 
-    <action id="ShowIntentionActions" class="com.intellij.codeInsight.intention.actions.ShowIntentionActionsAction"
+    <action id="ShowIntentionActions" class="com.intellij.openapi.actionSystem.EmptyAction"
             icon="AllIcons.Actions.IntentionBulbGrey"/>
 
     <group id="ShowIntentionsGroup" compact="true">
@@ -333,7 +333,7 @@
     <group id="CodeMenu" popup="true">
       <reference ref="OverrideMethods"/>
       <reference ref="ImplementMethods"/>
-      <action id="Generate" class="com.intellij.codeInsight.generation.actions.GenerateAction"/>
+      <action id="Generate" class="com.intellij.openapi.actionSystem.EmptyAction"/>
       <separator/>
 
       <group id="CodeCompletionGroup" class="com.intellij.codeInsight.completion.actions.CodeCompletionGroup" popup="true">
@@ -484,9 +484,9 @@
     <action id="CodeVisionToggleAction" class="com.intellij.codeInsight.hints.codeVision.CodeVisionToggleAction" />
 
     <!-- Refactor -->
-    <group id="RefactoringMenu" popup="true">
+    <group id="RefactoringMenu" popup="true" class="com.intellij.openapi.actionSystem.EmptyActionGroup">
       <action id="Refactorings.QuickListPopupAction" class="com.intellij.refactoring.actions.RefactoringQuickListPopupAction"/>
-      <action id="RenameElement" class="com.intellij.refactoring.actions.RenameElementAction"/>
+      <action id="RenameElement" class="com.intellij.openapi.actionSystem.EmptyAction"/>
       <action id="ChangeSignature" class="com.intellij.refactoring.actions.ChangeSignatureAction"/>
       <separator/>
       <group id="IntroduceActionsGroup" popup="true" class="com.intellij.ide.actions.PopupInMainMenuActionGroup">
@@ -817,7 +817,7 @@
       <reference ref="CompareTwoFiles"/>
     </group>
 
-    <group id="EditorPopupMenu1.FindRefactor" compact="true">
+    <group id="EditorPopupMenu1.FindRefactor" compact="true" class="com.intellij.openapi.actionSystem.EmptyActionGroup">
       <reference ref="FindUsages"/>
       <group id="EditorPopupMenu.GoTo" popup="true">
         <reference ref="GotoDeclaration"/>
diff --git a/plugins/git4idea/resources/intellij.vcs.git.xml b/plugins/git4idea/resources/intellij.vcs.git.xml
index 97c25f0d998ca..9f33ea28de27b 100644
--- a/plugins/git4idea/resources/intellij.vcs.git.xml
+++ b/plugins/git4idea/resources/intellij.vcs.git.xml
@@ -280,7 +280,7 @@
       <add-to-group group-id="VcsGlobalGroup" anchor="after" relative-to-action="Vcs.Specific"/>
     </group>
 
-    <group id="Git.ContextMenu" class="git4idea.actions.GitMenu" popup="true" searchable="false">
+    <group id="Git.ContextMenu" class="git4idea.actions.GitMenu" popup="false" searchable="false">
       <reference ref="Git.FileActions"/>
       <reference ref="Show.Current.Revision"/>
       <reference ref="ChangesView.Revert"/>
@@ -290,7 +290,7 @@
       <reference ref="Git.RevertResolved"/>
       <separator/>
       <reference ref="GitRepositoryActions"/>
-      <add-to-group group-id="VcsGroup" anchor="last"/>
+      <add-to-group group-id="EditorPopupMenu" anchor="last"/>
     </group>
 
     <action id="Git.ShowBranches" class="git4idea.actions.GitBranchesComboBoxAction" icon="AllIcons.Vcs.Branch"