diff --git a/KeePassKit b/KeePassKit
index 24e7caed..4aaf8d26 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 24e7caedbf96dcebeca1f19279b527bf03b672b1
+Subproject commit 4aaf8d2642cbd681102a00463df9712fe8200934
diff --git a/MacPass/MPFixAutotypeWindowController.m b/MacPass/MPFixAutotypeWindowController.m
index e02ef8f7..4c66903a 100644
--- a/MacPass/MPFixAutotypeWindowController.m
+++ b/MacPass/MPFixAutotypeWindowController.m
@@ -21,18 +21,6 @@ NSString *const kMPTitleCell = @"TitleCell";
 NSString *const kMPIsDefaultCell = @"IsDefaultCell";
 NSString *const kMPIconCell = @"IconCell";
 
-/* Helper Categries */
-
-@implementation KPKGroup (MPFixAutotypeWindowControllerBreadCrumb)
-
-- (NSString *)breadcrumb {
-  if(self.parent) {
-    return [[self.parent breadcrumb] stringByAppendingFormat:@" > %@", self.name];
-  }
-  return self.name;
-}
-
-@end
 
 @implementation KPKWindowAssociation (MPFixAutotypeWindowControllerQualifedName)
 
@@ -133,7 +121,7 @@ NSString *const kMPIconCell = @"IconCell";
       return entry.title;
     }
     if(group) {
-      return [group breadcrumb];
+      return [group breadcrumbWithSeparator:@" > "];
     }
     return [association qualifedName];
   }