diff --git a/macosx/ActionMenuRatioToDisplayRatioTransformer.m b/macosx/ActionMenuRatioToDisplayRatioTransformer.m
index ea7fa5b02..b1995a0e5 100644
--- a/macosx/ActionMenuRatioToDisplayRatioTransformer.m
+++ b/macosx/ActionMenuRatioToDisplayRatioTransformer.m
@@ -38,7 +38,7 @@
 
 - (id) transformedValue: (id) value
 {
-    return value == nil ?  nil : [NSString stringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)",
+    return value == nil ? nil : [NSString stringWithFormat: NSLocalizedString(@"Stop at Ratio (%.2f)",
                                                 "Action context menu -> ratio stop"), [value floatValue]];
 }
 
diff --git a/macosx/ActionMenuSpeedToDisplayLimitTransformer.m b/macosx/ActionMenuSpeedToDisplayLimitTransformer.m
index 34ad9092d..c8c2690a6 100644
--- a/macosx/ActionMenuSpeedToDisplayLimitTransformer.m
+++ b/macosx/ActionMenuSpeedToDisplayLimitTransformer.m
@@ -38,7 +38,7 @@
 
 - (id) transformedValue: (id) value
 {
-    return value == nil ?  nil : [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)",
+    return value == nil ? nil : [NSString stringWithFormat: NSLocalizedString(@"Limit (%d KB/s)",
                     "Action context menu -> upload/download limit"), [value intValue]];
 }
 
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 57914c8e1..107a892f1 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -566,21 +566,24 @@
 		enumerator = [fTorrents objectEnumerator];
         torrent = [enumerator nextObject]; //first torrent
 		
-		BOOL pexEnabled = ![torrent privateTorrent];
+		BOOL pexEnabled = ![torrent privateTorrent] && [torrent isPaused];
 		int pexState = [torrent pex] ? NSOnState : NSOffState;
 		
 		while ((pexEnabled || pexState != NSMixedState)
                 && (torrent = [enumerator nextObject]))
         {
             if (pexEnabled)
-                pexEnabled = ![torrent privateTorrent];
+                pexEnabled = ![torrent privateTorrent] && [torrent isPaused];
             
             if (pexState != NSMixedState && pexState != ([torrent pex] ? NSOnState : NSOffState))
                 pexState = NSMixedState;
         }
 		
+        #warning change even when already active
 		[fPexCheck setEnabled: pexEnabled];
 		[fPexCheck setState: pexState];
+        [fPexCheck setToolTip: !pexEnabled ? NSLocalizedString(@"PEX can only be toggled on public torrents when paused.",
+                                    "Inspector -> pex check") : @""];
     }
     else
     {
@@ -603,6 +606,7 @@
 		
 		[fPexCheck setEnabled: NO];
         [fPexCheck setState: NSOffState];
+        [fPexCheck setToolTip: @""];
     }
     
     [self updateInfoStats];