diff --git a/MacPass/MPTOTPSetupViewController.m b/MacPass/MPTOTPSetupViewController.m
index 296aa6e3..c3541c69 100644
--- a/MacPass/MPTOTPSetupViewController.m
+++ b/MacPass/MPTOTPSetupViewController.m
@@ -91,6 +91,7 @@ typedef NS_ENUM(NSUInteger, MPOTPType) {
 - (IBAction)save:(id)sender {
   // Update entry settings!
   // FIXME: add model observing to ensure correct history recording
+  [self.view.window makeFirstResponder:nil];
   [self.generator saveToEntry:self.representedEntry];
   [self.presentingViewController dismissViewController:self];
 }