diff --git a/ui/src/components/AgentConfigForm.tsx b/ui/src/components/AgentConfigForm.tsx
index d27cf6acf30..76bc4011347 100644
--- a/ui/src/components/AgentConfigForm.tsx
+++ b/ui/src/components/AgentConfigForm.tsx
@@ -1092,11 +1092,14 @@ export function AgentConfigForm(props: AgentConfigFormProps) {
       )}
 
       {/* ---- Execution ---- */}
+      {configurationShell && sectionVisible("environment") ? (
+        <div id="config-environment" className="scroll-mt-24" />
+      ) : null}
       {sectionVisible("environment") && (forcedKubernetes ? (
         // Instance execution policy forces the managed Kubernetes sandbox
         // (executionMode=kubernetes): never offer local / non-Kubernetes targets.
         // Render the environment read-only instead of the selectable picker.
-        <div id={configurationShell ? "config-environment" : undefined} className={cn(!cards && (isCreate ? "border-t border-border" : "border-b border-border"), configurationShell && "scroll-mt-24")}>
+        <div className={cn(!cards && (isCreate ? "border-t border-border" : "border-b border-border"))}>
           {cards
             ? <h3 className="text-sm font-medium mb-3">Environment</h3>
             : <div className="px-4 py-2 text-xs font-medium text-muted-foreground">Environment</div>
@@ -1121,7 +1124,7 @@ export function AgentConfigForm(props: AgentConfigFormProps) {
           </div>
         </div>
       ) : showEnvironmentOverrideControl ? (
-        <div id={configurationShell ? "config-environment" : undefined} className={cn(!cards && (isCreate ? "border-t border-border" : "border-b border-border"), configurationShell && "scroll-mt-24")}>
+        <div className={cn(!cards && (isCreate ? "border-t border-border" : "border-b border-border"))}>
           {cards
             ? <h3 className="text-sm font-medium mb-3">Environment</h3>
             : <div className="px-4 py-2 text-xs font-medium text-muted-foreground">Environment</div>
diff --git a/ui/src/components/agent-configuration-shell.test.ts b/ui/src/components/agent-configuration-shell.test.ts
index a1922c26902..3e056b18f19 100644
--- a/ui/src/components/agent-configuration-shell.test.ts
+++ b/ui/src/components/agent-configuration-shell.test.ts
@@ -16,7 +16,7 @@ describe("agent configuration shell", () => {
   it("does not guess an inherited adapter model from available choices", () => {
     const agent = {
       adapterType: "claude_local",
-      adapterConfig: { modelReasoningEffort: "high" },
+      adapterConfig: { modelReasoningEffort: "high", env: { EXAMPLE: "value" } },
       runtimeConfig: { heartbeat: { enabled: true, intervalSec: 300 } },
       permissions: { trustPreset: "standard" },
       defaultEnvironmentId: null,
@@ -27,6 +27,7 @@ describe("agent configuration shell", () => {
       modelInherited: true,
       environmentInherited: true,
       apiKeyCount: 2,
+      environmentVariableCount: 1,
     });
   });
 
diff --git a/ui/src/pages/AgentDetail.tsx b/ui/src/pages/AgentDetail.tsx
index e149159badc..42a44e51002 100644
--- a/ui/src/pages/AgentDetail.tsx
+++ b/ui/src/pages/AgentDetail.tsx
@@ -1783,6 +1783,7 @@ function AgentConfigurePage({
     { label: "Model", value: effectiveConfig.model, section: "runtime", inherited: effectiveConfig.modelInherited },
     { label: "Cost saver", value: effectiveConfig.cheapModel, section: "runtime", inherited: effectiveConfig.cheapInherited },
     { label: "Environment", value: effectiveConfig.environment, section: "environment", inherited: effectiveConfig.environmentInherited },
+    { label: "Variables", value: String(effectiveConfig.environmentVariableCount), section: "environment" },
     { label: "Heartbeat", value: effectiveConfig.cadence, section: "schedule" },
     { label: "Trust", value: effectiveConfig.trust, section: "access" },
     { label: "API keys", value: String(effectiveConfig.apiKeyCount), section: "keys" },