diff --git a/macosx/TorrentTableView.h b/macosx/TorrentTableView.h
index 77d2c80d9..a6ddb419c 100644
--- a/macosx/TorrentTableView.h
+++ b/macosx/TorrentTableView.h
@@ -26,7 +26,7 @@
 #import <transmission.h>
 #import <Controller.h>
 
-#define GROUP_SEPARATOR_HEIGHT 20.0
+#define GROUP_SEPARATOR_HEIGHT 18.0
 
 @class TorrentCell;
 
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index b61defedd..5dbbba236 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -130,7 +130,8 @@
 
 - (NSString *) tableView: (NSTableView *) tableView typeSelectStringForTableColumn: (NSTableColumn *) tableColumn row: (int) row
 {
-    return [[fTorrents objectAtIndex: row] name];
+    id object = [fTorrents objectAtIndex: row];
+    return [object isKindOfClass: [Torrent class]] ? [object name] : [[self preparedCellAtColumn: 0 row: row] stringValue];
 }
 
 - (void) updateTrackingAreas