diff --git a/ChangeLog b/ChangeLog
index ac7e307c2..e59d48c7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-20 18:48-EST Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Source/NSWindow.m: (-setFrame:): Correct window resize when
+	in window menus are used and size constraints on the window don't
+	allow it to accommodate the menu.
+
 2014-02-18  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSTextView.m (-insertText:): Ignore nil argument.
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index d6170c8fb..6edb1bf74 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -2174,7 +2174,18 @@ titleWithRepresentedFilename(NSString *representedFilename)
     }
   if (_maximumSize.height > 0 && frameRect.size.height > _maximumSize.height)
     {
-      frameRect.size.height = _maximumSize.height;
+      NSInterfaceStyle style = 
+	NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", nil);
+
+      if (style != NSWindows95InterfaceStyle)
+	{
+	  frameRect.size.height = _maximumSize.height;
+	}
+      else
+	{
+	  float menuHeight = [[GSTheme theme] menuHeightForWindow:self];
+	  frameRect.size.height = _maximumSize.height + menuHeight;
+	}
     }
   if (frameRect.size.width < _minimumSize.width)
     {