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 7cd5e9efed12..c685df5286fc 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
@@ -742,14 +742,7 @@ public class FocusManagerImpl extends IdeFocusManager implements Disposable {
       myCallbackOnActivation = null;
 
       if (cmd != null) {
-        requestFocus(cmd, true).notify(callback).doWhenRejected(new Runnable() {
-          public void run() {
-            focusLastFocusedComponent(ideFrame);
-          }
-        });
-      }
-      else {
-        focusLastFocusedComponent(ideFrame);
+        requestFocus(cmd, true).notify(callback);
       }
     }