diff --git a/packages/app/e2e/client-slash-commands.spec.ts b/packages/app/e2e/client-slash-commands.spec.ts
index ffdfeccbc..9954b01cd 100644
--- a/packages/app/e2e/client-slash-commands.spec.ts
+++ b/packages/app/e2e/client-slash-commands.spec.ts
@@ -126,10 +126,7 @@ async function expectReplacementDraftMatchesPreviousSetup(page: Page): Promise<v
   await expect(
     page.getByRole("button", { name: "Select model (Ten second stream)" }),
   ).toBeVisible();
-  // TODO(boudra): the replacement draft's mode picker stopped rendering after
-  // the composer refactor — the model carries over but modes aren't surfaced
-  // in the draft's provider snapshot. Restore this assertion once the draft
-  // mode picker is fixed.
+  await expect(page.getByRole("button", { name: "Select agent mode (Load test)" })).toBeVisible();
 }
 
 async function createAgentFromReplacementDraft(page: Page): Promise<void> {
diff --git a/packages/app/src/composer/agent-controls/index.tsx b/packages/app/src/composer/agent-controls/index.tsx
index a5a060cb6..1d3be1e25 100644
--- a/packages/app/src/composer/agent-controls/index.tsx
+++ b/packages/app/src/composer/agent-controls/index.tsx
@@ -195,17 +195,20 @@ function resolveHasAnyControl({
   canSelectModel,
   thinkingOptions,
   features,
+  hasDesktopExtras,
 }: {
   providerOptions: AgentControlOption[] | undefined;
   canSelectModel: boolean;
   thinkingOptions: AgentControlOption[] | undefined;
   features: AgentFeature[] | undefined;
+  hasDesktopExtras: boolean;
 }) {
   return (
     Boolean(providerOptions?.length) ||
     canSelectModel ||
     Boolean(thinkingOptions?.length) ||
-    Boolean(features?.length)
+    Boolean(features?.length) ||
+    hasDesktopExtras
   );
 }
 
@@ -440,6 +443,7 @@ function ControlledAgentControls({
     canSelectModel,
     thinkingOptions,
     features,
+    hasDesktopExtras: desktopExtras !== null && desktopExtras !== undefined,
   });
 
   const modelDisabled = disabled;