diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index cbc14b47..f2383dcc 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -307,6 +307,8 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
   }
   else  {
     view = [tableView makeViewWithIdentifier:_MPTableStringCellView owner:self];
+    [view.textField unbind:NSValueBinding];
+    view.textField.stringValue = @"";
     if(!isModifedColumn) {
       /* clean up old formatter that might be left */
       view.textField.formatter = nil;
@@ -364,9 +366,6 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
                                        NSStringFromSelector(@selector(history))];
       [view.textField bind:NSValueBinding toObject:view withKeyPath:historyCountKeyPath options:nil];
     }
-    else if(isIndexColumn) {
-      view.textField.stringValue = @"";
-    }
   }
   return view;
 }