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 dfbf3ddd486b..13269fee8c5a 100644
--- a/platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java
+++ b/platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java
@@ -182,8 +182,10 @@ public abstract class FocusCommand extends ActiveRunnable implements Expirable {
           // This change seems reasonable to me. But as far as some implementations
           // can ignore the "forced" parameter we can get bad focus behaviour.
           // So let's start from mac.
-          if (!myToFocus.requestFocusInWindow() && (isForced() && SystemInfo.isMac)) {
-            myToFocus.requestFocus();
+          if (!(myToFocus.requestFocusInWindow())) {
+            if (!SystemInfo.isMac || isForced() ) {
+              myToFocus.requestFocus();
+            }
           }
         }
       }