diff --git a/platform/platform-api/src/com/intellij/ui/ExcludingTraversalPolicy.java b/platform/platform-api/src/com/intellij/ui/ExcludingTraversalPolicy.java
index e2acc21b3d25..e6fedf213f80 100644
--- a/platform/platform-api/src/com/intellij/ui/ExcludingTraversalPolicy.java
+++ b/platform/platform-api/src/com/intellij/ui/ExcludingTraversalPolicy.java
@@ -85,6 +85,6 @@ public class ExcludingTraversalPolicy extends FocusTraversalPolicy {
 
   @Override
   public Component getDefaultComponent(Container aContainer) {
-    return myWrappee.getDefaultComponent(aContainer);
+    return getFirstComponent(aContainer);
   }
 }