diff --git a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
index c90db82b0f9e..99721109ec70 100644
--- a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
+++ b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
+import com.intellij.openapi.application.ex.ApplicationEx;
 import com.intellij.openapi.application.impl.ApplicationImpl;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.keymap.impl.IdeKeyEventDispatcher;
@@ -608,7 +609,7 @@ public class IdeEventQueue extends EventQueue {
       if (focusOwner == null || !focusOwner.isShowing() || focusOwner instanceof JFrame || focusOwner instanceof JDialog) {
 
         final Application app = ApplicationManager.getApplication();
-        if (app instanceof ApplicationImpl && !((ApplicationImpl) app).isComponentsCreated()) {
+        if (app instanceof ApplicationEx && !((ApplicationEx) app).isLoaded()) {
           return;
         }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java b/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java
index 60bf1ec3a48c..40184ad941f7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ public interface ApplicationEx extends Application {
    * @throws InvalidDataException
    */
   void load(String optionsPath) throws IOException, InvalidDataException;
+  boolean isLoaded();
 
   @NotNull
   String getName();
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
index a9a028b012ba..c7885547669c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
@@ -164,6 +164,7 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application
     }
   );
   private boolean myIsFiringLoadingEvent = false;
+  private boolean myLoaded = false;
   @NonNls private static final String WAS_EVER_SHOWN = "was.ever.shown";
 
   private Boolean myActive;
@@ -550,6 +551,12 @@ public class ApplicationImpl extends ComponentManagerImpl implements Application
     finally {
       HeavyProcessLatch.INSTANCE.processFinished();
     }
+    myLoaded = true;
+  }
+
+  @Override
+  public boolean isLoaded() {
+    return myLoaded;
   }
 
   @Override
diff --git a/platform/testFramework/src/com/intellij/mock/MockApplicationEx.java b/platform/testFramework/src/com/intellij/mock/MockApplicationEx.java
index 30db3597a740..5b078fbcec3f 100644
--- a/platform/testFramework/src/com/intellij/mock/MockApplicationEx.java
+++ b/platform/testFramework/src/com/intellij/mock/MockApplicationEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,6 +48,11 @@ public class MockApplicationEx extends MockApplication implements ApplicationEx
   public void load(String path) throws IOException, InvalidDataException {
   }
 
+  @Override
+  public boolean isLoaded() {
+    return true;
+  }
+
   @Override
   public void exit(boolean force) {
   }