From 0f9095a33fc117002e7f449539dd25b56ed494c5 Mon Sep 17 00:00:00 2001
From: Jake <jacob@coder.com>
Date: Thu, 26 Mar 2026 19:56:11 +1100
Subject: [PATCH] fix: settings window focus and infront

---
 Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift  | 2 +-
 Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenu.swift | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift b/Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift
index eab01ea..5157b18 100644
--- a/Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift
+++ b/Coder-Desktop/Coder-Desktop/Coder_DesktopApp.swift
@@ -198,5 +198,5 @@ extension AppDelegate {
 
 @MainActor
 func appActivate() {
-    NSApp.activate()
+    NSApp.activate(ignoringOtherApps: true)
 }
diff --git a/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenu.swift b/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenu.swift
index a48be35..6771fcf 100644
--- a/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenu.swift
+++ b/Coder-Desktop/Coder-Desktop/Views/VPN/VPNMenu.swift
@@ -83,8 +83,10 @@ struct VPNMenu<VPN: VPNService, FS: FileSyncDaemon>: View {
                 }
                 AuthButton<VPN>()
                 Button {
+                    NSApp.setActivationPolicy(.regular)
                     openSettings()
                     appActivate()
+                    NSApp.arrangeInFront(nil)
                 } label: {
                     ButtonRowView { Text("Settings") }
                 }.buttonStyle(.plain)