diff --git a/MacPass/MPEntryInspectorViewController.m b/MacPass/MPEntryInspectorViewController.m
index a11b6120..a8c65356 100644
--- a/MacPass/MPEntryInspectorViewController.m
+++ b/MacPass/MPEntryInspectorViewController.m
@@ -158,6 +158,7 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
   
   
   self.customFieldsTableView.backgroundColor = NSColor.clearColor;
+  self.customFieldsTableView.usesAutomaticRowHeights = YES;
   [self.customFieldsTableView bind:NSContentBinding toObject:_customFieldsController withKeyPath:NSStringFromSelector(@selector(arrangedObjects)) options:nil];
   self.customFieldsTableView.delegate = _customFieldTableDelegate;