diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index 2ac3275..34a208d 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -203,7 +203,6 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        tabBarController!.delegate = self
         searchController.searchBar.delegate = self
         tableView.delegate = self
         tableView.dataSource = self
@@ -234,6 +233,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        tabBarController!.delegate = self
         if let path = tableView.indexPathForSelectedRow {
             tableView.deselectRow(at: path, animated: false)
         }
diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift
index d4cc7da..86d6e9a 100644
--- a/pass/Controllers/SettingsTableViewController.swift
+++ b/pass/Controllers/SettingsTableViewController.swift
@@ -136,7 +136,6 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        tabBarController!.delegate = self
         NotificationCenter.default.addObserver(self, selector: #selector(SettingsTableViewController.actOnPasswordStoreErasedNotification), name: .passwordStoreErased, object: nil)
         self.passwordRepositoryTableViewCell.detailTextLabel?.text = SharedDefaults[.gitURL]?.host
         touchIDTableViewCell.accessoryView = touchIDSwitch
@@ -145,6 +144,11 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele
         setPasscodeLockTouchIDCells()
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(true)
+        tabBarController!.delegate = self
+    }
+    
     private func hasTouchID() -> Bool {
         let context = LAContext()
         var error: NSError?