diff --git a/Cartfile.resolved b/Cartfile.resolved
index 39fcb6d9..6dbeb46f 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "mstarke/HNHUi" "1.0.1"
-github "mstarke/KeePassKit" "1.0"
+github "mstarke/KeePassKit" "1.0.1"
 github "sparkle-project/Sparkle" "1.12.0b1"
diff --git a/MacPass/MPAppDelegate.h b/MacPass/MPAppDelegate.h
index 727173f6..53e3c108 100644
--- a/MacPass/MPAppDelegate.h
+++ b/MacPass/MPAppDelegate.h
@@ -30,7 +30,6 @@ APPKIT_EXTERN NSString *const MPDidChangeStoredKeyFilesSettings;
 
 @property (strong) IBOutlet NSWindow *passwordCreatorWindow;
 @property (strong) IBOutlet NSWindow *welcomeWindow;
-@property (strong) MPAutotypeDaemon *autotypeDaemon;
 @property (weak) IBOutlet NSMenuItem *saveMenuItem;
 
 @property (nonatomic, assign) BOOL isAllowedToStoreKeyFile;
diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 12af8491..385aaaf4 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -379,8 +379,7 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
 - (void)performAutotypeForEntry:(id)sender {
   id<MPTargetNodeResolving> entryResolver = [NSApp targetForAction:@selector(currentTargetEntry)];
   KPKEntry *targetEntry = [entryResolver currentTargetEntry];
-  MPAutotypeDaemon *autotyped = ((MPAppDelegate *)[NSApplication sharedApplication].delegate).autotypeDaemon;
-  [autotyped performAutotypeForEntry:targetEntry];
+  [[MPAutotypeDaemon defaultDaemon] performAutotypeForEntry:targetEntry];
 }
 
 - (void)showInspector:(id)sender {