diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index c09fa089..274d738a 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -376,7 +376,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
 #pragma mark MPTargetItemResolving
 - (NSArray<KPKEntry *> *)currentTargetEntries {
   NSInteger activeRow = self.entryTable.clickedRow;
-  if(activeRow > -1) {
+  if(activeRow > -1 && activeRow < [self.entryArrayController.arrangedObjects count]) {
     return @[ [self.entryArrayController arrangedObjects][activeRow] ];
   }
   return self.entryArrayController.selectedObjects;