diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 895e1d269..79127b72b 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -867,29 +867,28 @@ typedef enum
             [components addObject: NSLocalizedString(@"Handshaking", "Inspector -> peer -> status")];
         else
         {
-            NSString * firstString;
+            NSMutableArray * peerStatusArray = [NSMutableArray arrayWithCapacity: 2];
+            
             if (status & TR_PEER_STATUS_CLIENT_IS_SENDING)
-                firstString = NSLocalizedString(@"Uploading to peer", "Inspector -> peer -> status");
+                [peerStatusArray addObject: NSLocalizedString(@"Uploading to peer", "Inspector -> peer -> status")];
             else if (status & TR_PEER_STATUS_PEER_IS_INTERESTED)
-                firstString = NSLocalizedString(@"Peer wants our data", "Inspector -> peer -> status");
+                [peerStatusArray addObject: NSLocalizedString(@"Peer wants our data", "Inspector -> peer -> status")];
             else if (status & TR_PEER_STATUS_PEER_IS_CHOKED)
-                firstString = NSLocalizedString(@"Refusing to send data to peer", "Inspector -> peer -> status");
-            else
-                firstString = @"";
+                [peerStatusArray addObject: NSLocalizedString(@"Refusing to send data to peer", "Inspector -> peer -> status")];
+            else;
             
-            NSString * secondString;
             if (status & TR_PEER_STATUS_PEER_IS_SENDING)
-                secondString = NSLocalizedString(@"Downloading from peer", "Inspector -> peer -> status");
+                [peerStatusArray addObject: NSLocalizedString(@"Downloading from peer", "Inspector -> peer -> status")];
             else if (status & TR_PEER_STATUS_CLIENT_SENT_REQUEST)
-                secondString = NSLocalizedString(@"Requesting data from peer", "Inspector -> peer -> status");
+                [peerStatusArray addObject: NSLocalizedString(@"Requesting data from peer", "Inspector -> peer -> status")];
             else if (status & TR_PEER_STATUS_CLIENT_IS_INTERESTED)
-                secondString = NSLocalizedString(@"Waiting to request data from peer", "Inspector -> peer -> status");
+                [peerStatusArray addObject: NSLocalizedString(@"Waiting to request data from peer", "Inspector -> peer -> status")];
             else if (status & TR_PEER_STATUS_CLIENT_IS_CHOKED)
-                secondString = NSLocalizedString(@"Peer will not send us data", "Inspector -> peer -> status");
-            else
-                secondString = @"";
+                [peerStatusArray addObject: NSLocalizedString(@"Peer will not send us data", "Inspector -> peer -> status")];
+            else;
             
-            [components addObject: [NSString stringWithFormat: @"%@ - %@", firstString, secondString]];
+            if ([peerStatusArray count] > 0)
+                [components addObject: [peerStatusArray componentsJoinedByString: @" - "]];
         }
                 
         return [components componentsJoinedByString: @"\n"];