diff --git a/src/components/EndpointWizard.tsx b/src/components/EndpointWizard.tsx
index 3f50c77c3..db1fc91f7 100644
--- a/src/components/EndpointWizard.tsx
+++ b/src/components/EndpointWizard.tsx
@@ -9,6 +9,7 @@ import type {
 import type { ScreenProps } from "../handlers/types";
 import { coreOptsFromCtx } from "../handlers/utils";
 import { Layout } from "./Layout";
+import { FormRadioGroup, type FormRadioOption } from "./FormRadioGroup";
 import { Stepper, type Step } from "./ui/stepper";
 import { TextInput } from "./ui/text-input";
 import { Spinner } from "./ui/spinner";
@@ -254,10 +255,8 @@ function NameStep({
   );
 }
 
-interface VersionOption {
+interface VersionOption extends FormRadioOption {
   value: string;
-  label: string;
-  detail: string;
 }
 
 function VersionStep({
@@ -285,14 +284,18 @@ function VersionStep({
       .map((v) => ({
         value: v.harnessVersion ?? "",
         label: `version ${v.harnessVersion}`,
-        detail: `${v.status} · updated ${v.updatedAt?.toISOString().slice(0, 10) ?? ""}`,
+        description: `${v.status} · updated ${v.updatedAt?.toISOString().slice(0, 10) ?? ""}`,
       }))
       .sort((a, b) => Number(b.value) - Number(a.value));
     // Create mode offers "latest": omitting targetVersion tracks the newest
     // version at creation time.
     return mode === "create"
       ? [
-          { value: "", label: "latest", detail: "track the most recent version (default)" },
+          {
+            value: "",
+            label: "latest",
+            description: "track the most recent version (default)",
+          },
           ...listed,
         ]
       : listed;
@@ -322,28 +325,27 @@ function VersionStep({
 
   return (
     <Box flexDirection="column">
-      <Question text="which harness version should this endpoint serve?" />
       {versions.isPending ? (
-        <Spinner label="loading versions…" />
+        <>
+          <Question text="which harness version should this endpoint serve?" />
+          <Spinner label="loading versions…" />
+        </>
       ) : versions.isError ? (
-        <Text color={theme.colors.error}>✗ {(versions.error as Error).message}</Text>
+        <>
+          <Question text="which harness version should this endpoint serve?" />
+          <Text color={theme.colors.error}>✗ {(versions.error as Error).message}</Text>
+        </>
       ) : options.length === 0 ? (
-        <Text color={theme.colors.muted}>this harness has no versions</Text>
+        <>
+          <Question text="which harness version should this endpoint serve?" />
+          <Text color={theme.colors.muted}>this harness has no versions</Text>
+        </>
       ) : (
-        options.map((option, i) => {
-          const selected = i === index;
-          return (
-            <Box key={option.value === "" ? "(latest)" : option.value}>
-              <Text color={selected ? theme.colors.focus : theme.colors.muted}>
-                {selected ? "● " : "○ "}
-              </Text>
-              <Text bold={selected} color={selected ? theme.colors.focus : theme.colors.text}>
-                {option.label.padEnd(12)}
-              </Text>
-              <Text color={theme.colors.muted}>{option.detail}</Text>
-            </Box>
-          );
-        })
+        <FormRadioGroup
+          helpText="which harness version should this endpoint serve?"
+          options={options}
+          focusedIndex={index}
+        />
       )}
     </Box>
   );
diff --git a/src/components/FormRadioGroup.tsx b/src/components/FormRadioGroup.tsx
index abe8cfd6a..f3b5ddec6 100644
--- a/src/components/FormRadioGroup.tsx
+++ b/src/components/FormRadioGroup.tsx
@@ -9,7 +9,7 @@ export interface FormRadioOption {
 }
 
 export interface FormRadioGroupProps {
-  name: string;
+  name?: string;
   helpText: string;
   options: FormRadioOption[];
   // highlighted/hovered row
@@ -32,7 +32,7 @@ export function FormRadioGroup({
   return (
     <Box flexDirection="column">
       <Box flexDirection="column">
-        <Text color={theme.colors.text}>{name}</Text>
+        {name && <Text color={theme.colors.text}>{name}</Text>}
         <Text color={theme.colors.muted}>{helpText}</Text>
       </Box>
       <Box
diff --git a/src/handlers/harness/endpoint/create/create.screen.test.tsx b/src/handlers/harness/endpoint/create/create.screen.test.tsx
index 86425b688..3cc250103 100644
--- a/src/handlers/harness/endpoint/create/create.screen.test.tsx
+++ b/src/handlers/harness/endpoint/create/create.screen.test.tsx
@@ -82,6 +82,7 @@ describe("harness endpoint create wizard", () => {
     // Versions listed newest first after the "latest" default.
     await waitForText(r.lastFrame, "which harness version should this endpoint serve?");
     expect(r.lastFrame()).toContain("● latest");
+    expect(r.lastFrame()).toContain("│ ● latest");
     expect(r.lastFrame()).toContain("version 2");
     expect(r.lastFrame()).toContain("version 1");
     await r.press("down"); // version 2
diff --git a/src/handlers/harness/endpoint/update/update.screen.test.tsx b/src/handlers/harness/endpoint/update/update.screen.test.tsx
index 4fc80137d..e3eb1ee1f 100644
--- a/src/handlers/harness/endpoint/update/update.screen.test.tsx
+++ b/src/handlers/harness/endpoint/update/update.screen.test.tsx
@@ -90,6 +90,7 @@ describe("harness endpoint update wizard", () => {
     // The endpoint's current target (version 1) is preselected; no "latest"
     // option exists in update mode.
     await waitForText(r.lastFrame, "● version 1");
+    expect(r.lastFrame()).toContain("│ ● version 1");
     expect(r.lastFrame()).not.toContain("latest");
     await r.press("up"); // version 2 (sorted newest first)
     await waitForText(r.lastFrame, "● version 2");