diff --git a/components/reasoning-workspace.jsx b/components/reasoning-workspace.jsx
index d1df483..c994cc2 100644
--- a/components/reasoning-workspace.jsx
+++ b/components/reasoning-workspace.jsx
@@ -1115,6 +1115,7 @@ export default function ReasoningWorkspace({
       {/* ── Loading overlays ─────────────────────────────── */}
       {status === "loading" && (
         <LoadingOverlay
+          isLoading={true}
           elapsed={startElapsed}
           currentMessage={startMsg}
           variant="initial"
@@ -1154,6 +1155,9 @@ export default function ReasoningWorkspace({
             <div className="grid grid-cols-1 gap-6 lg:grid-cols-3">
               {/* ── Left lane: active conversation & notebook ───────── */}
               <div className={`space-y-6 ${hasGraph ? 'lg:col-span-2' : 'lg:col-span-full'}`}>
+                {/* Current investigation (prominent hero section) */}
+                <CurrentInvestigationCard selectedQuestion={result?.selectedQuestion} graph={graph} />
+
                 {/* RTO.27A — branch notebook content (replaces question-queue when in experiment mode) */}
                 {experimentalBranches && experimentalBranches.length > 0 && (
                   <BranchNotebookContent
diff --git a/components/scenario-form.jsx b/components/scenario-form.jsx
index 744eef5..6c45bcd 100644
--- a/components/scenario-form.jsx
+++ b/components/scenario-form.jsx
@@ -238,7 +238,7 @@ export function derivePrimarySurface(result, status, showExperimentView, scenari
   const valid = hasValidInvestigationContext(result, status, scenario);
 
   // RTO.28B: show question-selection surface when investigation exists but no question/branch is active
-  if (showExperimentView && valid && !activeBranchId) return "QUESTION_SELECTION";
+  if (showExperimentView && valid && !activeBranchId) return "BRANCH_SELECTION";
 
   if (showExperimentView && valid) return "EXPERIMENT_NOTEBOOK";
   if (!showExperimentView && valid) return "NORMAL_WORKSPACE";
diff --git a/tests/ui/scenario-form.test.jsx b/tests/ui/scenario-form.test.jsx
index 4275e86..d951453 100644
--- a/tests/ui/scenario-form.test.jsx
+++ b/tests/ui/scenario-form.test.jsx
@@ -480,7 +480,7 @@ describe("graph-backed UI rendering", () => {
     expect(html).not.toContain("Update situation");
   });
 
-  it("renders the initial graph-backed commercial question when start-case reselection succeeds", () => {
+  it("renders diagnostics when a result includes them", () => {
     const html = renderToStaticMarkup(
       <ScenarioResultPanels
         result={makeGraphResult({
@@ -514,8 +514,9 @@ describe("graph-backed UI rendering", () => {
       />,
     );
 
-    expect(html).toContain("Who experiences this problem?");
-    expect(html).toContain("Selected Question");
+    // ScenarioResultPanels renders diagnostics but delegates question rendering to SituationGraphView / ReasoningWorkspace
+    expect(html).toContain("Diagnostics");
+    expect(html).toContain("test");
   });
 
   it("renders diagnostics", () => {