Fix host-scoped browser shortcut follow-ups

packages/app/src/hooks/use-keyboard-shortcuts.ts

@@ -258,6 +258,7 @@ export function useKeyboardShortcuts({
         action: result.match.action,
         payload: result.match.payload,
         domEvent: input.domEvent,
+        browserFocusRestoreElement: input.browserFocusRestoreElement,
       });
       if (!handled || !input.domEvent) {
         return;

packages/desktop/src/features/browser-automation/ipc.ts

@@ -21,7 +21,7 @@ import {
   listRegisteredPaseoBrowserIds,
   listRegisteredPaseoBrowserIdsForWorkspace,
   getPaseoBrowserWebContentsForHostWindow,
-  getWorkspaceActivePaseoBrowserId,
+  getWorkspaceActivePaseoBrowserIdForHostWindow,
   getPaseoBrowserWorkspaceId,
 } from "../browser-webviews/index.js";
 
@@ -352,7 +352,9 @@ function createRegistry(hostWebContentsId: number): BrowserRegistry {
       return contents ? adaptWebContents(contents) : null;
     },
     getBrowserWorkspaceId: getPaseoBrowserWorkspaceId,
-    getWorkspaceActiveBrowserId: getWorkspaceActivePaseoBrowserId,
+    getWorkspaceActiveBrowserId(workspaceId: string): string | null {
+      return getWorkspaceActivePaseoBrowserIdForHostWindow(workspaceId, hostWebContentsId);
+    },
   };
 }