diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j
index b1569c4d6..3c21e3983 100644
--- a/AppKit/CPTableHeaderView.j
+++ b/AppKit/CPTableHeaderView.j
@@ -333,7 +333,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         var headerView = [_tableView._tableColumns[column] headerView];
         [headerView setThemeState:CPThemeStateHighlighted];
 
-        if (_tableView._editingColumn == column)
+        if (_tableView._editingCellIndex || _tableView._editingColumn == column)
             [[self window] makeFirstResponder:_tableView];
     }