diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index d032f58..d356875 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -585,7 +585,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
 
     func searchBar(_ searchBar: UISearchBar, selectedScopeButtonIndexDidChange selectedScope: Int) {
         // update the default search scope
-        SharedDefaults[.searchDefault] = SearchBarScope(rawValue: selectedScope) ?? .all
+        SharedDefaults[.searchDefault] = SearchBarScope(rawValue: selectedScope)
         updateSearchResults(for: searchController)
     }
 
diff --git a/passKit/Helpers/DefaultsKeys.swift b/passKit/Helpers/DefaultsKeys.swift
index 016d0cf..3218d5a 100644
--- a/passKit/Helpers/DefaultsKeys.swift
+++ b/passKit/Helpers/DefaultsKeys.swift
@@ -40,7 +40,7 @@ public extension DefaultsKeys {
     static let isRememberGitCredentialPassphraseOn = DefaultsKey<Bool>("isRememberGitCredentialPassphraseOn", defaultValue: false)
     static let isShowFolderOn = DefaultsKey<Bool>("isShowFolderOn", defaultValue: true)
     static let isHidePasswordImagesOn = DefaultsKey<Bool>("isHidePasswordImagesOn", defaultValue: false)
-    static let searchDefault = DefaultsKey<SearchBarScope>("searchDefault", defaultValue: .all)
+    static let searchDefault = DefaultsKey<SearchBarScope?>("searchDefault", defaultValue: .all)
     static let passwordGeneratorFlavor = DefaultsKey<String>("passwordGeneratorFlavor", defaultValue: "Apple")
 
     static let encryptInArmored = DefaultsKey<Bool>("encryptInArmored", defaultValue: false)