diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index 64cdf14f..5a3d8148 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -373,8 +373,9 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
   }
   /*
    If a group is the current item, see if we already show that group
+	 also test if an element has been selected (issue #257)
    */
-  if(document.selectedItem == document.selectedGroup) {
+  if(document.selectedItem == document.selectedGroup && document.selectedItem != nil) {
     if(document.hasSearch) {
       /* If search was active, stop it and exit */
       [document exitSearch:self];