diff --git a/Table Tool/Document.m b/Table Tool/Document.m
index 4e72717..9191cf0 100644
--- a/Table Tool/Document.m	
+++ b/Table Tool/Document.m	
@@ -126,6 +126,14 @@ -(void)applyTableFont {
         font = [NSFont systemFontOfSize:fontSize];
     }
     [dataCell setFont:font];
+    for (NSTableColumn *col in self.tableView.tableColumns) {
+        if ([col.identifier isEqualToString:TTLineNumberColumnIdentifier]) {
+            [col.dataCell setFont:font];
+            break;
+        }
+    }
+    CGFloat fontHeight = ceil(font.ascender - font.descender + font.leading);
+    self.tableView.rowHeight = MAX(17.0, fontHeight + self.tableView.intercellSpacing.height);
     [self.tableView reloadData];
 }