diff --git a/macosx/FileNameCell.m b/macosx/FileNameCell.m
index b452a9257..1ee09db92 100644
--- a/macosx/FileNameCell.m
+++ b/macosx/FileNameCell.m
@@ -91,7 +91,8 @@
     
     //title
     NSColor * specialColor = nil;
-    if ([self isHighlighted] && [[controlView window] isKeyWindow] && [[controlView window] firstResponder] == controlView)
+    if ([self isHighlighted]
+            && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
         specialColor = [NSColor whiteColor];
     else if ([[(FileOutlineView *)[self controlView] torrent] checkForFiles:
                     [[self objectValue] objectForKey: @"Indexes"]] == NSOffState)
diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m
index c93fa8219..d75b937db 100644
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -223,7 +223,8 @@
     
     //text color
     NSColor * titleColor, * statusColor;
-    if ([self isHighlighted] && [[controlView window] isKeyWindow] && [[controlView window] firstResponder] == controlView)
+    if ([self isHighlighted]
+        && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
     {
         titleColor = [NSColor whiteColor];
         statusColor = [NSColor whiteColor];