diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
index 52f7509a082b..216f6a7f6fca 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
@@ -140,6 +140,7 @@ public class IdeFrameImpl extends JFrame implements IdeFrameEx, DataProvider {
       return;
     }
 
+    myRootPane.setBorder(null);
     boolean isNotClassic = Boolean.parseBoolean(String.valueOf(Toolkit.getDefaultToolkit().getDesktopProperty("win.xpstyle.themeActive")));
     if (isNotClassic && (state & MAXIMIZED_BOTH) != 0) {
       IdeFrame[] projectFrames = WindowManager.getInstance().getAllProjectFrames();
@@ -159,9 +160,6 @@ public class IdeFrameImpl extends JFrame implements IdeFrameEx, DataProvider {
         }
       }
     }
-    else {
-      myRootPane.setBorder(null);
-    }
   }
 
   protected IdeRootPane createRootPane(ActionManagerEx actionManager,
@@ -536,6 +534,10 @@ public class IdeFrameImpl extends JFrame implements IdeFrameEx, DataProvider {
     if (myFrameDecorator != null) {
       myFrameDecorator.toggleFullScreen(state);
     }
+    IdeFrame[] frames = WindowManager.getInstance().getAllProjectFrames();
+    for (IdeFrame frame : frames) {
+      ((IdeFrameImpl)frame).updateBorder();
+    }
   }
 
   @Override