diff --git a/platform/platform-api/src/com/intellij/ui/SearchTextField.java b/platform/platform-api/src/com/intellij/ui/SearchTextField.java
index 58fbfd79909f..f79d7528e371 100644
--- a/platform/platform-api/src/com/intellij/ui/SearchTextField.java
+++ b/platform/platform-api/src/com/intellij/ui/SearchTextField.java
@@ -18,7 +18,6 @@ package com.intellij.ui;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.CommonShortcuts;
 import com.intellij.openapi.actionSystem.IdeActions;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.ui.JBMenuItem;
@@ -204,9 +203,7 @@ public class SearchTextField extends JPanel {
       final ActionManager actionManager = ActionManager.getInstance();
       if (actionManager != null) {
         final AnAction clearTextAction = actionManager.getAction(IdeActions.ACTION_CLEAR_TEXT);
-        if (clearTextAction.getShortcutSet().getShortcuts().length == 0) {
-          clearTextAction.registerCustomShortcutSet(CommonShortcuts.ESCAPE, this);
-        }
+        clearTextAction.registerCustomShortcutSet(clearTextAction.getShortcutSet(), this);
       }
     }
   }
diff --git a/platform/platform-resources/src/idea/Keymap_Default.xml b/platform/platform-resources/src/idea/Keymap_Default.xml
index d55e485180aa..83773d111b93 100644
--- a/platform/platform-resources/src/idea/Keymap_Default.xml
+++ b/platform/platform-resources/src/idea/Keymap_Default.xml
@@ -15,9 +15,9 @@
   <action id="FullyExpandTreeNode">
     <keyboard-shortcut first-keystroke="MULTIPLY"/>
   </action>
-  <!--<action id="TextComponent.ClearAction">
+  <action id="TextComponent.ClearAction">
     <keyboard-shortcut first-keystroke="ESCAPE"/>
-  </action>-->
+  </action>
   <action id="ExpandTreeNode">
     <keyboard-shortcut first-keystroke="ADD"/>
   </action>