diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h
index 5e15e8b57..863c0b6b9 100644
--- a/macosx/InfoWindowController.h
+++ b/macosx/InfoWindowController.h
@@ -33,6 +33,8 @@
     NSArray * fTorrents, * fPeers, * fFiles;
     NSImage * fAppIcon, * fDotGreen, * fDotRed;
     
+    BOOL fCanResizeVertical;
+    
     IBOutlet NSTabView * fTabView;
 
     IBOutlet NSImageView * fImageView;
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 91dd83006..7616974b8 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -71,6 +71,8 @@
         fAppIcon = [NSImage imageNamed: @"NSApplicationIcon"];
         fDotGreen = [NSImage imageNamed: @"GreenDot.tiff"];
         fDotRed = [NSImage imageNamed: @"RedDot.tiff"];
+        
+        fCanResizeVertical = NO;
     }
     return self;
 }
@@ -698,7 +700,7 @@
 {
     [self updateInfoStats];
     
-    BOOL canResizeHor = NO;
+    BOOL canResizeVertical = NO;
     float height;
     if ([identifier isEqualToString: TAB_ACTIVITY_IDENT])
     {
@@ -708,12 +710,12 @@
     else if ([identifier isEqualToString: TAB_PEERS_IDENT])
     {
         height = TAB_PEERS_HEIGHT;
-        canResizeHor = YES;
+        canResizeVertical = YES;
     }
     else if ([identifier isEqualToString: TAB_FILES_IDENT])
     {
         height = TAB_FILES_HEIGHT;
-        canResizeHor = YES;
+        canResizeVertical = YES;
     }
     else if ([identifier isEqualToString: TAB_OPTIONS_IDENT])
         height = TAB_OPTIONS_HEIGHT;
@@ -728,17 +730,22 @@
     frame.origin.y -= difference;
     frame.size.height += difference;
     
-    if (animate)
+    if (!fCanResizeVertical || !canResizeVertical)
     {
-        [view setHidden: YES];
-        [window setFrame: frame display: YES animate: YES];
-        [view setHidden: NO];
+        if (animate)
+        {
+            [view setHidden: YES];
+            [window setFrame: frame display: YES animate: YES];
+            [view setHidden: NO];
+        }
+        else
+            [window setFrame: frame display: YES];
     }
-    else
-        [window setFrame: frame display: YES];
     
     [window setMinSize: NSMakeSize([window minSize].width, frame.size.height)];
-    [window setMaxSize: NSMakeSize([window maxSize].width, canResizeHor ? FLT_MAX : frame.size.height)];
+    [window setMaxSize: NSMakeSize([window maxSize].width, canResizeVertical ? FLT_MAX : frame.size.height)];
+    
+    fCanResizeVertical = canResizeVertical;
 }
 
 - (void) setNextTab