diff --git a/macosx/FileNameCell.m b/macosx/FileNameCell.m
index 1ee09db92..b452a9257 100644
--- a/macosx/FileNameCell.m
+++ b/macosx/FileNameCell.m
@@ -91,8 +91,7 @@
     
     //title
     NSColor * specialColor = nil;
-    if ([self isHighlighted]
-            && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
+    if ([self isHighlighted] && [[controlView window] isKeyWindow] && [[controlView window] firstResponder] == controlView)
         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 6dd910a6d..c93fa8219 100644
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -223,8 +223,7 @@
     
     //text color
     NSColor * titleColor, * statusColor;
-    if ([self isHighlighted]
-            && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
+    if ([self isHighlighted] && [[controlView window] isKeyWindow] && [[controlView window] firstResponder] == controlView)
     {
         titleColor = [NSColor whiteColor];
         statusColor = [NSColor whiteColor];