diff --git a/platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java b/platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java
index 54a43658b7dd..b2e433ccffe1 100644
--- a/platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java
+++ b/platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java
@@ -149,9 +149,7 @@ public abstract class FocusCommand extends ActiveRunnable implements Expirable {
     @NotNull
     public final ActionCallback run() {
       if (myToFocus != null) {
-        if (!myToFocus.requestFocusInWindow()) {
-          myToFocus.requestFocus();
-        }
+        myToFocus.requestFocusInWindow();
       }
       clear();
       return new ActionCallback.Done();
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
index a060fa84bfb4..b90a697e9f87 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
@@ -629,7 +629,7 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa
               }
             }
 
-            getFocusManager().requestFocus(myCancelButton, true);
+            myCancelButton.requestFocusInWindow();
           }
         }
       });