diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index e503efd5a..6631c721d 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -244,7 +244,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
         [self setGridColor:[CPColor grayColor]];
         [self setGridStyleMask:CPTableViewGridNone];
 
-        _headerView = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, [self bounds].size.width, 23.0)];
+        _headerView = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, [self bounds].size.width, _rowHeight)];
 
         [_headerView setTableView:self];
 
@@ -844,6 +844,11 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     return _selectedColumnIndexes;
 }
 
+- (int)selectedRow
+{
+	return [_selectedRowIndexes lastIndex];
+}
+
 - (CPIndexSet)selectedRowIndexes
 {
     return _selectedRowIndexes;
@@ -3027,7 +3032,7 @@ var CPTableViewDataSourceKey        = @"CPTableViewDataSourceKey",
         [self setGridColor:[CPColor grayColor]];
         [self setGridStyleMask:CPTableViewGridNone];
 
-        _headerView = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, [self bounds].size.width, 23.0)];
+        _headerView = [[CPTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, [self bounds].size.width, _rowHeight)];
 
         [_headerView setTableView:self];