diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
index ed95f146b921..30e48f66f225 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java
@@ -811,7 +811,9 @@ public class FocusManagerImpl extends IdeFocusManager implements Disposable {
     assertDispatchThread();
 
     Component result = null;
-    if (myRunContext != null) {
+    if (!ApplicationManager.getApplication().isActive()) {
+      result = myLastFocusedAtDeactivation.get(getLastFocusedFrame()).get();
+    } else if (myRunContext != null) {
       result = (Component)myRunContext.getData(PlatformDataKeys.CONTEXT_COMPONENT.getName());
     }