diff --git a/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java b/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java
index 228c6b266d45..07021bc996ff 100644
--- a/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java
+++ b/platform/platform-impl/src/com/intellij/ui/FocusTrackback.java
@@ -429,7 +429,7 @@ public class FocusTrackback {
 
       if (eachTrackback.getRequestor() instanceof AbstractPopup) {
         FocusTrackback newTrackback = ((AbstractPopup)eachTrackback.getRequestor()).getFocusTrackback();
-        if (eachTrackback == newTrackback) break;
+        if (newTrackback == null || eachTrackback == newTrackback) break;
         if (eachTrackback == null || eachTrackback.isConsumed()) break;
 
         eachTrackback  = newTrackback;