From 816313402b1ec13a4f5a65a2efa3ada5c7a9fefc Mon Sep 17 00:00:00 2001
From: Joshua Swigut <62301576+JJSwigut@users.noreply.github.com>
Date: Mon, 15 Dec 2025 22:18:04 -0500
Subject: [PATCH] Fix keyboard shortcut conflict for Focus Goose Window (#5809)

Co-authored-by: Swiggy Swigut <swiggy@squareup.com>
---
 ui/desktop/src/main.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ui/desktop/src/main.ts b/ui/desktop/src/main.ts
index b944615dd2..6f442ccd96 100644
--- a/ui/desktop/src/main.ts
+++ b/ui/desktop/src/main.ts
@@ -1865,6 +1865,14 @@ async function appMain() {
     console.error('Error registering launcher hotkey:', e);
   }
 
+  try {
+    globalShortcut.register('CommandOrControl+Alt+G', () => {
+      focusWindow();
+    });
+  } catch (e) {
+    console.error('Error registering focus window hotkey:', e);
+  }
+
   session.defaultSession.webRequest.onBeforeSendHeaders((details, callback) => {
     details.requestHeaders['Origin'] = 'http://localhost:5173';
     callback({ cancel: false, requestHeaders: details.requestHeaders });
@@ -2041,7 +2049,7 @@ async function appMain() {
     fileMenu.submenu.append(
       new MenuItem({
         label: 'Focus Goose Window',
-        accelerator: 'CmdOrCtrl+Alt+Shift+G',
+        accelerator: 'CmdOrCtrl+Alt+G',
         click() {
           focusWindow();
         },