diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index eafe9c8f..05e008ea 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -391,7 +391,9 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
 - (NSArray<KPKEntry *> *)currentTargetEntries {
   NSInteger activeRow = self.entryTable.clickedRow;
   if(activeRow > -1 && activeRow < [self.entryArrayController.arrangedObjects count]) {
-    return @[ [self.entryArrayController arrangedObjects][activeRow] ];
+    if(![self.entryArrayController.selectionIndexes containsIndex:activeRow]) {
+      return @[ [self.entryArrayController arrangedObjects][activeRow] ];
+    }
   }
   return self.entryArrayController.selectedObjects;
 }