diff --git a/client/src/components/run/LaneConsolePane.tsx b/client/src/components/run/LaneConsolePane.tsx
index 0e30a6d..523ca4e 100644
--- a/client/src/components/run/LaneConsolePane.tsx
+++ b/client/src/components/run/LaneConsolePane.tsx
@@ -296,9 +296,10 @@ export function LaneConsolePane({
           data-testid="pane-lane-select"
           aria-label={tLanes("splitView.paneLaneLabel")}
           className="rounded border border-border bg-surface-1 px-2 py-1 text-xs text-fg-secondary"
-          value={laneId}
-          onChange={(e) => onLaneIdChange(Number(e.target.value))}
+          value={laneId ?? ""}
+          onChange={(e) => e.target.value && onLaneIdChange(Number(e.target.value))}
         >
+          <option value="">{tLanes("splitView.pickLane")}</option>
           {lanes.map((l) => (
             <option key={l.id} value={l.id}>
               {l.title || l.cwd}
@@ -353,7 +354,7 @@ export function LaneConsolePane({
         </div>
       )}
 
-      {!handle ? (
+      {!handle && laneId !== null ? (
         <RunSetup
           laneId={laneId}
           prompt={prompt}
@@ -377,10 +378,12 @@ export function LaneConsolePane({
           runHistory={runHistory}
           onResumeFromHistory={onResumeFromHistory}
         />
+      ) : !handle && laneId === null ? (
+        <p className="text-sm text-fg-muted">{tLanes("splitView.pickLane")}</p>
       ) : (
         <div className="flex-1 min-h-0 flex flex-col">
           <TerminalView
-            runId={handle.id}
+            runId={handle!.id}
             wsBaseUrl={window.location.origin.replace(/^http/, "ws")}
           />
           <button