diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 2fe528208..6b7a5f528 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -5123,7 +5123,12 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     var hit = [super hitTest:aPoint];
 
     if ([[CPApp currentEvent] type] == CPLeftMouseDown && [hit acceptsFirstResponder] && ![self isRowSelected:[self rowForView:hit]])
+    {
+        if (_selectionHighlightStyle == CPTableViewSelectionHighlightStyleNone)
+            return hit;
+
         return self;
+    }
 
     return hit;
 }