diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
index eb72386668d9..31b261a1f92b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
@@ -651,7 +651,10 @@ public final class IdeKeyEventDispatcher implements Disposable {
     myContext.getActions().clear();
 
     if (isControlEnterOnDialog(component, sc)) return myContext;
-
+    if ((component instanceof JTextArea || component instanceof JTextField) && sc instanceof KeyboardShortcut) {
+      if (((JComponent)component).getActionForKeyStroke(((KeyboardShortcut)sc).getFirstKeyStroke()) != null) return myContext;
+    }
+    
     boolean hasSecondStroke = false;
 
     // here we try to find "local" shortcuts