diff --git a/platform/platform-resources/src/idea/Keymap_Emacs.xml b/platform/platform-resources/src/idea/Keymap_Emacs.xml
index 280be2cfcd99..b9950f364d51 100644
--- a/platform/platform-resources/src/idea/Keymap_Emacs.xml
+++ b/platform/platform-resources/src/idea/Keymap_Emacs.xml
@@ -273,6 +273,26 @@
     <action id="EditorBackwardParagraph">
       <keyboard-shortcut first-keystroke="control UP"/>
     </action>
+    <action id="EditorScrollToCenter">
+      <keyboard-shortcut first-keystroke="control L"/>
+    </action>
+    <action id="EditorEnter">
+      <keyboard-shortcut first-keystroke="ENTER"/>
+      <keyboard-shortcut first-keystroke="control M"/>
+    </action>
+    <action id="EditorChooseLookupItem">
+      <keyboard-shortcut first-keystroke="ENTER"/>
+      <keyboard-shortcut first-keystroke="control M"/>
+    </action>
+    <action id="NextTemplateVariable">
+      <keyboard-shortcut first-keystroke="TAB"/>
+      <keyboard-shortcut first-keystroke="ENTER"/>
+      <keyboard-shortcut first-keystroke="control M"/>
+    </action>
+    <action id="Console.Execute">
+      <keyboard-shortcut first-keystroke="ENTER"/>
+      <keyboard-shortcut first-keystroke="control M"/>
+    </action>
 
     <!--Disabled shortcuts-->
     <action id="CollapseAllRegions"/>
diff --git a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
index 70e655965133..7e82afffdbc2 100644
--- a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
+++ b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
@@ -170,6 +170,8 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
     { "alt R",                    "Django.RunManageTaskAction", "org.jetbrains.plugins.ruby.tasks.rake.actions.RakeTasksPopupAction"},
     });
     put("Emacs", new String[][] {
+    { "ENTER",                    "EditorChooseLookupItem", "NextTemplateVariable", "EditorEnter", "Images.Thumbnails.EnterAction",
+                                  "PropertyInspectorActions.EditValue", "Console.Execute", "Console.TableResult.EditValue"},
     { "F2",                       "GotoNextError", "GuiDesigner.EditComponent", "GuiDesigner.EditGroup", "Console.TableResult.EditValue"},
     { "alt ENTER",                "ShowIntentionActions", "Console.TableResult.EditValue", "DatabaseView.PropertiesAction"},
     { "TAB",                      "EditorChooseLookupItemReplace", "NextTemplateVariable", "NextParameter", "EditorIndentSelection", 
@@ -181,6 +183,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
     { "control 3",                "GotoBookmark3", "FileChooser.GotoModule"},
     { "control D",                "$Delete", "Diff.ShowDiff", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
     { "control K",                "EditorCutLineEnd", "CheckinProject"},
+    { "control M",                "EditorEnter", "EditorChooseLookupItem", "NextTemplateVariable", "Console.Execute"},
     { "control N",                "EditorDown", "FileChooser.NewFolder"},
     { "control P",                "EditorUp", "FileChooser.TogglePathShowing"},
     { "control R",                "Console.TableResult.Reload", "org.jetbrains.plugins.ruby.rails.console.ReloadSources", "FindPrevious"},