diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
index c5e94cbf32d3..99a8739a63ba 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
@@ -1348,9 +1348,10 @@ public class AbstractPopup implements JBPopup {
       Runnable runFinal = new Runnable() {
         @Override
         public void run() {
+          //noinspection SSBasedInspection
+          SwingUtilities.invokeLater(myFinalRunnable);
           //noinspection SSBasedInspection
           SwingUtilities.invokeLater(typeAheadDone.createSetDoneRunnable());
-          myFinalRunnable.run();
           myFinalRunnable = null;
         }
       };