diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
index 3c6b7a74303e..391539d5364a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
@@ -942,7 +942,7 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra
       }
 
       private void flushEvents() {
-        if (myWrapper.isToDispatchTypeAhead()) {
+        if (myWrapper.isToDispatchTypeAhead() && myContextOnFinish != null) {
           myContextOnFinish.dispatch(myEvents);
         }
       }