diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index a17bd878f..863e9f88d 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -129,11 +129,10 @@ class TerminalController: NSWindowController, NSWindowDelegate,
 
         for (index, window) in windows.enumerated().prefix(9) {
             let action = "goto_tab:\(index + 1)"
-            guard let equiv = ghostty.config.keyEquivalent(for: action) else {
-                continue
-            }
 
-            window.keyEquivalent = "\(equiv)"
+            if let equiv = ghostty.config.keyEquivalent(for: action) {
+                window.keyEquivalent = "\(equiv)"
+            }
         }
     }
 
diff --git a/macos/Sources/Features/Terminal/TerminalToolbar.swift b/macos/Sources/Features/Terminal/TerminalToolbar.swift
index 811026526..1f9980b9d 100644
--- a/macos/Sources/Features/Terminal/TerminalToolbar.swift
+++ b/macos/Sources/Features/Terminal/TerminalToolbar.swift
@@ -64,7 +64,7 @@ class TerminalToolbar: NSToolbar, NSToolbarDelegate {
 
             button.frame = view.bounds
             button.isBordered = false
-            button.contentTintColor = .systemBlue
+            button.contentTintColor = .controlAccentColor
             button.state = .on
             button.imageScaling = .scaleProportionallyUpOrDown
             view.addSubview(button)