diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
index 5170788c589b..e0b0b84a314e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
@@ -516,7 +516,14 @@ public final class WindowManagerImpl extends WindowManagerEx implements NamedCom
       myDefaultFrameInfo.setBounds(FrameBoundsConverter.convertFromDeviceSpace(rawBounds));
     }
 
-    updateFrameBounds(frame);
+    if (!(FrameState.isMaximized(frame.getExtendedState()) || FrameState.isFullScreen(frame)) ||
+        !FrameState.isMaximized(myDefaultFrameInfo.getExtendedState())) // going to quit maximized
+    {
+      Rectangle bounds = myDefaultFrameInfo.getBounds();
+      if (bounds != null) {
+        frame.setBounds(bounds);
+      }
+    }
     frame.setExtendedState(myDefaultFrameInfo.getExtendedState());
 
     frame.setProject(project);