diff --git a/Stats/Views/AppSettings.swift b/Stats/Views/AppSettings.swift
index e4ea931b..83137615 100644
--- a/Stats/Views/AppSettings.swift
+++ b/Stats/Views/AppSettings.swift
@@ -47,12 +47,32 @@ class ApplicationSettings: NSStackView {
         scrollView.stackView.addArrangedSubview(self.buttonsView())
         
         self.addArrangedSubview(scrollView)
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(toggleUninstallHelperButton), name: .fanHelperState, object: nil)
     }
     
     required public init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
     
+    deinit {
+        NotificationCenter.default.removeObserver(self, name: .fanHelperState, object: nil)
+    }
+    
+    public func viewWillAppear() {
+        self.startAtLoginBtn?.state = LaunchAtLogin.isEnabled ? .on : .off
+        
+        var idx = self.updateSelector?.indexOfSelectedItem ?? 0
+        if let items = self.updateSelector?.menu?.items {
+            for (i, item) in items.enumerated() {
+                if let obj = item.representedObject as? String, obj == self.updateIntervalValue {
+                    idx = i
+                }
+            }
+        }
+        self.updateSelector?.selectItem(at: idx)
+    }
+    
     private func informationView() -> NSView {
         let view = NSStackView()
         view.heightAnchor.constraint(equalToConstant: 240).isActive = true