diff --git a/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib b/macosx/English.lproj/InfoWindow.nib/keyedobjects.nib
index 1b783799f..61acfc532 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 9c2bb2aa2..e8b5e68ff 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -79,6 +79,10 @@
     [fTabView selectTabViewItemWithIdentifier: identifier];
     [self setWindowForTab: identifier animate: NO];
     
+    if ([[fPeerTable sortDescriptors] count] == 0)
+        [fPeerTable setSortDescriptors: [NSArray arrayWithObject: [[fPeerTable tableColumnWithIdentifier: @"IP"]
+                                            sortDescriptorPrototype]]];
+    
     [self updateInfoForTorrents: [NSArray array]];
 }
 
@@ -499,8 +503,7 @@
     if ([oldDescriptors count] > 0)
         [descriptors addObject: [oldDescriptors objectAtIndex: 0]];
     
-    [descriptors addObject: [[[fPeerTable tableColumns] objectAtIndex: [fPeerTable columnWithIdentifier: @"IP"]]
-                                sortDescriptorPrototype]];
+    [descriptors addObject: [[fPeerTable tableColumnWithIdentifier: @"IP"] sortDescriptorPrototype]];
     
     return descriptors;
 }