diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index e8f244db..fc1a3889 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -252,6 +252,8 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
   NSTableCellView *view = nil;
   if(isTitleColumn || isGroupColumn) {
     view = [tableView makeViewWithIdentifier:_MPTableImageCellView owner:self];
+    [view.textField unbind:NSValueBinding];
+    [view.imageView unbind:NSValueBinding];
     if( isTitleColumn ) {
       NSString *titleKeyPath = [NSString stringWithFormat:@"%@.%@",
                                 NSStringFromSelector(@selector(objectValue)),