From 24f4ea62d04e17c7971f45f193d8fc072bdf5b8f Mon Sep 17 00:00:00 2001
From: "Vassiliy.Kudryashov" <Vassiliy.Kudryashov@jetbrains.com>
Date: Fri, 12 May 2017 20:20:35 +0300
Subject: [PATCH] IDEA-169849 Can't undo in Find in Path (after-review)

---
 .../intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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