diff --git a/platform/platform-resources/src/idea/Keymap_Default.xml b/platform/platform-resources/src/idea/Keymap_Default.xml
index 9328e35abb98..9e9bb154583e 100644
--- a/platform/platform-resources/src/idea/Keymap_Default.xml
+++ b/platform/platform-resources/src/idea/Keymap_Default.xml
@@ -1026,8 +1026,8 @@
     <keyboard-shortcut first-keystroke="control alt shift T"/>
   </action>
 
-  <action id="NewScratchFile">
-    <keyboard-shortcut first-keystroke="control alt shift INSERT"/>
+  <action id="EditorMatchBrace">
+    <keyboard-shortcut first-keystroke="control shift M" />
   </action>
 </keymap>
 </component>
diff --git a/platform/platform-resources/src/idea/Keymap_Eclipse.xml b/platform/platform-resources/src/idea/Keymap_Eclipse.xml
index f38bd23cfacb..1f2ddcf6eab2 100644
--- a/platform/platform-resources/src/idea/Keymap_Eclipse.xml
+++ b/platform/platform-resources/src/idea/Keymap_Eclipse.xml
@@ -59,7 +59,6 @@
     </action>
     <action id="EditorCodeBlockEnd">
       <keyboard-shortcut first-keystroke="control CLOSE_BRACKET" />
-      <keyboard-shortcut first-keystroke="shift control P" />
     </action>
     <action id="EditorDeleteToLineEnd">
       <keyboard-shortcut first-keystroke="shift control DELETE" />
@@ -359,5 +358,8 @@
     <action id="MoveLineDown" />
     <action id="MoveLineUp" />
     <action id="context.clear"/>
+    <action id="EditorMatchBrace">
+      <keyboard-shortcut first-keystroke="shift control P" />
+    </action>
   </keymap>
 </component>
diff --git a/platform/platform-resources/src/idea/Keymap_Mac.xml b/platform/platform-resources/src/idea/Keymap_Mac.xml
index c443858dd875..e85e5ebb0d35 100644
--- a/platform/platform-resources/src/idea/Keymap_Mac.xml
+++ b/platform/platform-resources/src/idea/Keymap_Mac.xml
@@ -581,5 +581,8 @@
       <keyboard-shortcut first-keystroke="meta alt MULTIPLY" second-keystroke="5"/>
       <keyboard-shortcut first-keystroke="meta alt MULTIPLY" second-keystroke="NUMPAD5"/>
     </action>
+    <action id="EditorMatchBrace">
+      <keyboard-shortcut first-keystroke="control M" replace-all="true"/>
+    </action>
   </keymap>
 </component>
diff --git a/platform/platform-resources/src/idea/Keymap_Netbeans.xml b/platform/platform-resources/src/idea/Keymap_Netbeans.xml
index 1f579be29aa9..95b3185cd178 100644
--- a/platform/platform-resources/src/idea/Keymap_Netbeans.xml
+++ b/platform/platform-resources/src/idea/Keymap_Netbeans.xml
@@ -376,5 +376,6 @@
       <keyboard-shortcut first-keystroke="control M"/>
       <keyboard-shortcut first-keystroke="shift F4"/>
     </action>
+    <action id="EditorMatchBrace"/>
   </keymap>
 </component>
diff --git a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
index bd53a43138a4..5bbad292ed80 100644
--- a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
+++ b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
@@ -156,6 +156,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
     { "shift meta RIGHT",         "EditorLineEndWithSelection", "ResizeToolWindowRight", },
     { "meta E",                   "RecentFiles", "Vcs.ShowMessageHistory"},
     { "alt R",                    "Django.RunManageTaskAction", "org.jetbrains.plugins.ruby.tasks.rake.actions.RakeTasksPopupAction"},
+    { "ctrl m",                   "EditorMatchBrace", "Vcs.ShowMessageHistory"},
     });
     put("Mac OS X", new String[][] {
     { "BACK_SPACE",               "$Delete", "EditorBackSpace", "Images.Thumbnails.UpFolder"},
diff --git a/resources/src/idea/JBuilderKeymap.xml b/resources/src/idea/JBuilderKeymap.xml
index 43368c2eab4d..eb37d5d6c200 100644
--- a/resources/src/idea/JBuilderKeymap.xml
+++ b/resources/src/idea/JBuilderKeymap.xml
@@ -149,6 +149,7 @@
       <keyboard-shortcut first-keystroke="F5"/>
     </action>
     <action id="ViewSource"/>
+    <action id="EditorMatchBrace"/>
   </keymap>
 </component>