diff --git a/packages/app/src/components/status-popover-body.tsx b/packages/app/src/components/status-popover-body.tsx
index 3fa655f6ac..9df2de52f7 100644
--- a/packages/app/src/components/status-popover-body.tsx
+++ b/packages/app/src/components/status-popover-body.tsx
@@ -321,7 +321,8 @@ export function StatusPopoverBody(props: { shown: Accessor<boolean> }) {
           name,
           status: mcpStatus(name),
           error: mcpError(name),
-          pending: !mcpStatus(name) || (toggleMcp.isPending && toggleMcp.variables === name),
+          loading: !mcpStatus(name),
+          pending: toggleMcp.isPending && toggleMcp.variables === name,
           onToggle: () => {
             if (toggleMcp.isPending) return
             toggleMcp.mutate(name)
diff --git a/packages/app/src/components/tools-menu.tsx b/packages/app/src/components/tools-menu.tsx
index afbb9077d2..5c1d06670e 100644
--- a/packages/app/src/components/tools-menu.tsx
+++ b/packages/app/src/components/tools-menu.tsx
@@ -31,6 +31,7 @@ export type ToolsMenuProps = {
     name: string
     status?: ToolsMenuStatus
     error?: string
+    loading?: boolean
     pending?: boolean
     onToggle?: () => void
   }>
@@ -101,9 +102,10 @@ export function ToolsMenu(props: ToolsMenuProps) {
                           </Show>
                           <Switch
                             checked={item.status === "connected"}
-                            disabled={item.pending || !item.status}
+                            disabled={item.loading}
                             hideLabel
                             onChange={item.onToggle}
+                            readOnly={item.pending}
                           >
                             {item.name}
                           </Switch>