diff --git a/pass/Controllers/PGPKeyImporter.swift b/pass/Controllers/PGPKeyImporter.swift
index 389e157..9452aa7 100644
--- a/pass/Controllers/PGPKeyImporter.swift
+++ b/pass/Controllers/PGPKeyImporter.swift
@@ -38,6 +38,9 @@ extension PGPKeyImporter {
 extension PGPKeyImporter where Self: UIViewController {
 
     func savePassphraseDialog() {
+        guard self.isReadyToUse() else {
+            return
+        }
         let savePassphraseAlert = UIAlertController(title: "Passphrase".localize(), message: "WantToSavePassphrase?".localize(), preferredStyle: .alert)
         // Do not save the key's passphrase.
         savePassphraseAlert.addAction(UIAlertAction(title: "No".localize(), style: .default) { _ in
diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift
index c138f5d..4f9a431 100644
--- a/pass/Controllers/SettingsTableViewController.swift
+++ b/pass/Controllers/SettingsTableViewController.swift
@@ -26,16 +26,13 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
     }
 
     @IBAction func savePGPKey(segue: UIStoryboardSegue) {
-        guard let sourceController = segue.source as? PGPKeyImporter else {
+        guard let sourceController = segue.source as? PGPKeyImporter, sourceController.isReadyToUse() else {
             return
         }
         savePGPKey(using: sourceController)
     }
 
     private func savePGPKey(using keyImporter: PGPKeyImporter) {
-        guard keyImporter.isReadyToUse() else {
-            return
-        }
         SVProgressHUD.setDefaultMaskType(.black)
         SVProgressHUD.setDefaultStyle(.light)
         SVProgressHUD.show(withStatus: "FetchingPgpKey".localize())