diff --git a/src/commands/doctor.ts b/src/commands/doctor.ts
index bee6db021..4143d1186 100644
--- a/src/commands/doctor.ts
+++ b/src/commands/doctor.ts
@@ -26,6 +26,7 @@ import {
   maybeRepairAnthropicOAuthProfileId,
   noteAuthProfileHealth,
 } from "./doctor-auth.js";
+import { doctorShellCompletion } from "./doctor-completion.js";
 import { loadAndMaybeMigrateDoctorConfig } from "./doctor-config-flow.js";
 import { maybeRepairGatewayDaemon } from "./doctor-gateway-daemon-flow.js";
 import { checkGatewayHealth } from "./doctor-gateway-health.js";
@@ -259,6 +260,11 @@ export async function doctorCommand(
 
   noteWorkspaceStatus(cfg);
 
+  // Check and fix shell completion
+  await doctorShellCompletion(runtime, prompter, {
+    nonInteractive: options.nonInteractive,
+  });
+
   const { healthOk } = await checkGatewayHealth({
     runtime,
     cfg,