diff --git a/Mail/Views/Settings/SettingsToggleCell.swift b/Mail/Views/Settings/SettingsToggleCell.swift
index 68eedacdb..7dfc570f4 100644
--- a/Mail/Views/Settings/SettingsToggleCell.swift
+++ b/Mail/Views/Settings/SettingsToggleCell.swift
@@ -36,6 +36,14 @@ struct SettingsToggleCell: View {
     @State private var toggleIsOn: Bool {
         didSet {
             UserDefaults.shared[keyPath: userDefaults] = toggleIsOn
+
+            // AppStorage updates the views only if directly called
+            if userDefaults == \.isAppLockEnabled {
+                AppStorage(UserDefaults.shared.key(.appLock)).wrappedValue = UserDefaults.shared.isAppLockEnabled
+                if UserDefaults.shared.isAppLockEnabled {
+                    appLockHelper.setTime()
+                }
+            }
         }
     }
 
diff --git a/Mail/Views/SplitView.swift b/Mail/Views/SplitView.swift
index 24a6d9c8f..466bb88a6 100644
--- a/Mail/Views/SplitView.swift
+++ b/Mail/Views/SplitView.swift
@@ -30,7 +30,7 @@ public class SplitViewManager: ObservableObject {
     @Published var showSearch = false
     @Published var selectedFolder: Folder?
     var splitViewController: UISplitViewController?
-    
+
     func adaptToProminentThreadView() {
         splitViewController?.hide(.primary)
         if splitViewController?.splitBehavior == .overlay {