diff --git a/macosx/English.lproj/InfoWindow.nib/info.nib b/macosx/English.lproj/InfoWindow.nib/info.nib
index 405f761ed..9076d3f55 100644
--- a/macosx/English.lproj/InfoWindow.nib/info.nib
+++ b/macosx/English.lproj/InfoWindow.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>94 65 356 240 0 0 1440 878 </string>
+	<string>69 61 356 240 0 0 1152 842 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>549</key>
@@ -24,6 +24,6 @@
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8I1119</string>
+	<string>8I127</string>
 </dict>
 </plist>
diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib
index 222f4d191..4fc9c7644 100644
Binary files a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib and b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib differ
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 1925daa47..0964e91b9 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -66,8 +66,9 @@
     frame.origin.y -= difference;
     frame.size.height += difference;
     [window setFrame: frame display: YES];
-    [window setMinSize: NSMakeSize( MIN_WINDOW_WIDTH, frame.size.height )];
-    [window setMaxSize: NSMakeSize( MAX_WINDOW_WIDTH, frame.size.height )];
+    
+    [window setMinSize: NSMakeSize(MIN_WINDOW_WIDTH, frame.size.height)];
+    [window setMaxSize: NSMakeSize(MAX_WINDOW_WIDTH, frame.size.height)];
 }
 
 - (void) dealloc
@@ -312,6 +313,14 @@
     return YES;
 }
 
+- (NSRect) windowWillUseStandardFrame: (NSWindow *) window defaultFrame: (NSRect) defaultFrame
+{
+    NSPoint windowOrigin = [window frame].origin;
+    NSSize minSize = [window minSize];
+    
+    return NSMakeRect(windowOrigin.x, windowOrigin.y, minSize.width, minSize.height);
+}
+
 - (void) tabView: (NSTabView *) tabView didSelectTabViewItem: (NSTabViewItem *) tabViewItem
 {
     NSWindow * window = [self window];
@@ -336,8 +345,9 @@
     [view setHidden: YES];
     [window setFrame: frame display: YES animate: YES];
     [view setHidden: NO];
-    [window setMinSize: NSMakeSize( MIN_WINDOW_WIDTH, frame.size.height )];
-    [window setMaxSize: NSMakeSize( MAX_WINDOW_WIDTH, frame.size.height )];
+    
+    [window setMinSize: NSMakeSize(MIN_WINDOW_WIDTH, frame.size.height)];
+    [window setMaxSize: NSMakeSize(MAX_WINDOW_WIDTH, frame.size.height)];
 }
 
 - (void) setNextTab