diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index aba52e27db41eadd68a772e9f5b09ba8b32c296f..3918fdac4029e5973c74fe74c258fe296d081067 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -30,7 +30,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useDebouncedValue } from "@tanstack/react-pacer/debouncer";
 import { gitBranchesQueryOptions, gitCreateWorktreeMutationOptions } from "~/lib/gitReactQuery";
 import { projectSearchEntriesQueryOptions } from "~/lib/projectReactQuery";
-import { serverKeybindingsQueryOptions } from "~/lib/serverReactQuery";
+import { serverConfigQueryOptions } from "~/lib/serverReactQuery";
 
 import { isElectron } from "../env";
 import { buildBootstrapInput } from "../historyBootstrap";
@@ -471,7 +471,10 @@ export default function ChatView() {
   );
   const effectivePathQuery = pathTriggerQuery.length > 0 ? debouncedPathQuery : "";
   const branchesQuery = useQuery(gitBranchesQueryOptions(api, gitCwd));
-  const keybindingsQuery = useQuery(serverKeybindingsQueryOptions(api));
+  const keybindingsQuery = useQuery({
+    ...serverConfigQueryOptions(api),
+    select: (config) => config.keybindings,
+  });
   const workspaceEntriesQuery = useQuery(
     projectSearchEntriesQueryOptions({
       api,
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 4beeff38c1fe65b6ee6ccc8a5ec6a286645c4ffd..2c29a6da4fef1e01c1bc0e2696def26ef5e29a8a 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -16,7 +16,7 @@ import {
 } from "../types";
 import { useNativeApi } from "../hooks/useNativeApi";
 import { gitRemoveWorktreeMutationOptions } from "../lib/gitReactQuery";
-import { serverKeybindingsQueryOptions } from "../lib/serverReactQuery";
+import { serverConfigQueryOptions } from "../lib/serverReactQuery";
 import { toastManager } from "./ui/toast";
 import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";
 
@@ -118,7 +118,10 @@ function terminalStatusIndicator(thread: Thread): TerminalStatusIndicator | null
 export default function Sidebar() {
   const { state, dispatch } = useStore();
   const api = useNativeApi();
-  const { data: keybindings = EMPTY_KEYBINDINGS } = useQuery(serverKeybindingsQueryOptions(api));
+  const { data: keybindings = EMPTY_KEYBINDINGS } = useQuery({
+    ...serverConfigQueryOptions(api),
+    select: (config) => config.keybindings,
+  });
   const queryClient = useQueryClient();
   const removeWorktreeMutation = useMutation(
     gitRemoveWorktreeMutationOptions({ api, queryClient }),
diff --git a/apps/web/src/lib/serverReactQuery.ts b/apps/web/src/lib/serverReactQuery.ts
index 835687a6cd6e9179c99bc9f396b1aabb0b41889f..8324cd33ef6bfdf0993a3eb9f078b0cc42d9a317 100644
--- a/apps/web/src/lib/serverReactQuery.ts
+++ b/apps/web/src/lib/serverReactQuery.ts
@@ -19,10 +19,3 @@ export function serverConfigQueryOptions(api: NativeApi | undefined) {
     staleTime: Infinity,
   });
 }
-
-export function serverKeybindingsQueryOptions(api: NativeApi | undefined) {
-  return queryOptions({
-    ...serverConfigQueryOptions(api),
-    select: (config) => config.keybindings,
-  });
-}