diff --git a/MacPass/MPEntryInspectorViewController.m b/MacPass/MPEntryInspectorViewController.m
index d7d16c2f..55e14d76 100644
--- a/MacPass/MPEntryInspectorViewController.m
+++ b/MacPass/MPEntryInspectorViewController.m
@@ -182,6 +182,10 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
                                                name:MPDocumentDidAddEntryNotification
                                              object:document];
   _windowAssociationsController.observer = document;
+  [NSNotificationCenter.defaultCenter addObserver:self
+                                         selector:@selector(_didChangeCurrentItem:)
+                                             name:MPDocumentCurrentItemChangedNotification
+                                           object:document];
 }
 
 - (void)dealloc {
@@ -620,4 +624,8 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
   [self.titleTextField becomeFirstResponder];
 }
 
+- (void)_didChangeCurrentItem:(NSNotification *)notificiation {
+  self.showPassword = NO;
+}
+
 @end