Index: Source/NSWindow.m
===================================================================
--- Source/NSWindow.m	(revision 32597)
+++ Source/NSWindow.m	(working copy)
@@ -2818,7 +2818,9 @@
   /*
    * Ensure that we have a miniwindow counterpart.
    */
-  if (_counterpart == 0 && [srv appOwnsMiniwindow])
+  if (_counterpart == 0 && [srv appOwnsMiniwindow] &&
+      (NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", nil)
+       != NSWindows95InterfaceStyle))
     {
       NSWindow *mini;
       NSMiniWindowView *v;
@@ -2837,7 +2839,10 @@
       RELEASE(v);
     }
   [self _lossOfKeyOrMainWindow];
-  [srv miniwindow: _windowNum];
+  if (_counterpart != 0)
+    {
+      [srv miniwindow: _windowNum];
+    }
   _f.visible = NO;
   
   /*