diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java
index a1fa4b80dccc..cbe315c0cedc 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java
@@ -308,7 +308,7 @@ public class PopupChooserBuilder {
       .setCancelCallback(myCancelCallback)
       .setAlpha(myAlpha)
       .setFocusOwners(myFocusOwners)
-      .setCancelKeyEnabled(myCancelKeyEnabled && !(myChooserComponent instanceof ListWithFilter))
+      .setCancelKeyEnabled(myCancelKeyEnabled)
       .setAdText(myAd, myAdAlignment)
       .setKeyboardActions(myKeyboardActions)
       .setMayBeParent(myMayBeParent)
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/StackingPopupDispatcherImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/StackingPopupDispatcherImpl.java
index d56e645b01fa..a91cf8f32288 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/StackingPopupDispatcherImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/StackingPopupDispatcherImpl.java
@@ -165,20 +165,7 @@ public class StackingPopupDispatcherImpl extends StackingPopupDispatcher impleme
     } else {
       popup = getFocusedPopup();
     }
-
-    if (popup == null) return false;
-
-
-    if (closeRequest) {
-      if (popup.isCancelKeyEnabled()) {
-        popup.cancel();
-        return true;
-      }
-    } else {
-      return popup.dispatchKeyEvent(e);
-    }
-
-    return false;
+    return popup != null && popup.dispatchKeyEvent(e);
   }