diff --git a/platform/platform-resources/src/idea/Keymap_Emacs.xml b/platform/platform-resources/src/idea/Keymap_Emacs.xml
index 4aadf95a1a3f..b4b5ade6c3bb 100644
--- a/platform/platform-resources/src/idea/Keymap_Emacs.xml
+++ b/platform/platform-resources/src/idea/Keymap_Emacs.xml
@@ -2,6 +2,7 @@
   <keymap name="Emacs" parent="$default" version="1" disable-mnemonics="false">
     <action id="EditorEscape">
       <keyboard-shortcut first-keystroke="ESCAPE" second-keystroke="ESCAPE"/>
+      <keyboard-shortcut first-keystroke="control G"/>
     </action>
     <action id="EditorCutLineBackward">
       <keyboard-shortcut first-keystroke="alt MINUS" second-keystroke="control K"/>
@@ -106,6 +107,8 @@
     </action>
     <action id="GotoClass">
       <keyboard-shortcut first-keystroke="shift alt G"/>
+    </action>
+    <action id="Switcher">
       <keyboard-shortcut first-keystroke="control X" second-keystroke="B"/>
     </action>
     <action id="GotoFile">