diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 4030c6afc..42f61dd74 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -3889,7 +3889,9 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (BOOL)_isFocused
 {
-    return [[self window] isKeyWindow] && [[self window] firstResponder] === self;
+    var isEditing = _editingRow !== CPNotFound || _editingCellIndex;
+
+    return [[self window] isKeyWindow] && ([[self window] firstResponder] === self || isEditing);
 }
 
 /*!