diff --git a/client/src/api/invocations.ts b/client/src/api/invocations.ts
index 2196f9a9254e..467267fe19f1 100644
--- a/client/src/api/invocations.ts
+++ b/client/src/api/invocations.ts
@@ -8,6 +8,7 @@ export type WorkflowInvocationElementView = components["schemas"]["WorkflowInvoc
 export type WorkflowInvocationCollectionView = components["schemas"]["WorkflowInvocationCollectionView"];
 export type InvocationJobsSummary = components["schemas"]["InvocationJobsResponse"];
 export type InvocationStep = components["schemas"]["InvocationStep"];
+export type InvocationMessage = components["schemas"]["InvocationMessageResponseUnion"];
 
 export type StepJobSummary =
     | components["schemas"]["InvocationStepJobsResponseStepModel"]
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 41866690c5cd..f878a162098a 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -8192,6 +8192,18 @@ export interface components {
                 [key: string]: number | undefined;
             };
         };
+        InvocationMessageResponseUnion:
+            | components["schemas"]["InvocationCancellationReviewFailedResponse"]
+            | components["schemas"]["InvocationCancellationHistoryDeletedResponse"]
+            | components["schemas"]["InvocationCancellationUserRequestResponse"]
+            | components["schemas"]["InvocationFailureDatasetFailedResponse"]
+            | components["schemas"]["InvocationFailureCollectionFailedResponse"]
+            | components["schemas"]["InvocationFailureJobFailedResponse"]
+            | components["schemas"]["InvocationFailureOutputNotFoundResponse"]
+            | components["schemas"]["InvocationFailureExpressionEvaluationFailedResponse"]
+            | components["schemas"]["InvocationFailureWhenNotBooleanResponse"]
+            | components["schemas"]["InvocationUnexpectedFailureResponse"]
+            | components["schemas"]["InvocationEvaluationWarningWorkflowOutputNotFoundResponse"];
         /** InvocationOutput */
         InvocationOutput: {
             /**
@@ -13459,19 +13471,7 @@ export interface components {
              * Messages
              * @description A list of messages about why the invocation did not succeed.
              */
-            messages: (
-                | components["schemas"]["InvocationCancellationReviewFailedResponse"]
-                | components["schemas"]["InvocationCancellationHistoryDeletedResponse"]
-                | components["schemas"]["InvocationCancellationUserRequestResponse"]
-                | components["schemas"]["InvocationFailureDatasetFailedResponse"]
-                | components["schemas"]["InvocationFailureCollectionFailedResponse"]
-                | components["schemas"]["InvocationFailureJobFailedResponse"]
-                | components["schemas"]["InvocationFailureOutputNotFoundResponse"]
-                | components["schemas"]["InvocationFailureExpressionEvaluationFailedResponse"]
-                | components["schemas"]["InvocationFailureWhenNotBooleanResponse"]
-                | components["schemas"]["InvocationUnexpectedFailureResponse"]
-                | components["schemas"]["InvocationEvaluationWarningWorkflowOutputNotFoundResponse"]
-            )[];
+            messages: components["schemas"]["InvocationMessageResponseUnion"][];
             /**
              * Model class
              * @description The name of the database model class.
diff --git a/client/src/components/Help/terms.yml b/client/src/components/Help/terms.yml
index a6df4b852a63..4710252b8a56 100644
--- a/client/src/components/Help/terms.yml
+++ b/client/src/components/Help/terms.yml
@@ -57,7 +57,7 @@ galaxy:
   invocations:
     states:
       scheduled: |
-        This state indicates the workflow invocation has had all of its job scheduled. This means all the
+        This state indicates the workflow invocation has had all of its jobs scheduled. This means all the
         datasets are likely created and Galaxy has created the stubs for the jobs in the workflow. *The jobs
         themselves might not have been queued or running.*
 
diff --git a/client/src/components/WorkflowInvocationState/InvocationMessage.vue b/client/src/components/WorkflowInvocationState/InvocationMessage.vue
index 7c1561576f39..fdf447621b25 100644
--- a/client/src/components/WorkflowInvocationState/InvocationMessage.vue
+++ b/client/src/components/WorkflowInvocationState/InvocationMessage.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import { computed } from "vue";
 
+import type { InvocationMessage } from "@/api/invocations";
 import { useWorkflowInstance } from "@/composables/useWorkflowInstance";
 
-import type { InvocationMessageResponseModel } from "./invocationMessageModel";
-
 import GenericHistoryItem from "@/components/History/Content/GenericItem.vue";
 import JobInformation from "@/components/JobInformation/JobInformation.vue";
 import WorkflowInvocationStep from "@/components/WorkflowInvocationState/WorkflowInvocationStep.vue";
@@ -49,7 +48,7 @@ interface Invocation {
 }
 
 interface InvocationMessageProps {
-    invocationMessage: InvocationMessageResponseModel;
+    invocationMessage: InvocationMessage;
     invocation: Invocation;
 }
 
@@ -79,7 +78,7 @@ const workflowStep = computed(() => {
 const dependentWorkflowStep = computed(() => {
     if ("dependent_workflow_step_id" in props.invocationMessage && workflow.value) {
         const stepId = props.invocationMessage["dependent_workflow_step_id"];
-        if (stepId !== undefined) {
+        if (stepId !== undefined && stepId !== null) {
             return workflow.value.steps[stepId];
         }
     }
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationHeader.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationHeader.vue
new file mode 100644
index 000000000000..f01618d86582
--- /dev/null
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationHeader.vue
@@ -0,0 +1,99 @@
+<script setup lang="ts">
+import { faClock } from "@fortawesome/free-regular-svg-icons";
+import { faArrowLeft, faEdit, faHdd, faSitemap } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { BButton, BButtonGroup } from "bootstrap-vue";
+
+import type { WorkflowInvocationElementView } from "@/api/invocations";
+import { useWorkflowInstance } from "@/composables/useWorkflowInstance";
+import localize from "@/utils/localization";
+
+import Heading from "../Common/Heading.vue";
+import SwitchToHistoryLink from "../History/SwitchToHistoryLink.vue";
+import UtcDate from "../UtcDate.vue";
+import WorkflowInvocationsCount from "../Workflow/WorkflowInvocationsCount.vue";
+import WorkflowRunButton from "../Workflow/WorkflowRunButton.vue";
+
+interface Props {
+    invocation: WorkflowInvocationElementView;
+    fromPanel?: boolean;
+}
+
+const props = defineProps<Props>();
+
+const { workflow } = useWorkflowInstance(props.invocation.workflow_id);
+
+function getWorkflowName(): string {
+    return workflow.value?.name || "...";
+}
+</script>
+
+<template>
+    <div>
+        <div class="d-flex flex-gapx-1">
+            <Heading h1 separator inline truncate size="xl" class="flex-grow-1">
+                Invoked Workflow: "{{ getWorkflowName() }}"
+            </Heading>
+
+            <div v-if="!props.fromPanel">
+                <BButton
+                    v-b-tooltip.hover.noninteractive
+                    :title="localize('Return to Invocations List')"
+                    class="text-nowrap"
+                    size="sm"
+                    variant="outline-primary"
+                    to="/workflows/invocations">
+                    <FontAwesomeIcon :icon="faArrowLeft" class="mr-1" />
+                    <span v-localize>Invocations List</span>
+                </BButton>
+            </div>
+        </div>
+        <div class="py-2 pl-3 d-flex justify-content-between align-items-center">
+            <div>
+                <i>
+                    <FontAwesomeIcon :icon="faClock" class="mr-1" />invoked
+                    <UtcDate :date="props.invocation.update_time" mode="elapsed" />
+                </i>
+                <span class="d-flex flex-gapx-1 align-items-center">
+                    <FontAwesomeIcon :icon="faHdd" />History:
+                    <SwitchToHistoryLink :history-id="props.invocation.history_id" />
+                </span>
+            </div>
+            <div v-if="workflow" class="d-flex flex-gapx-1 align-items-center">
+                <div class="d-flex flex-column align-items-end mr-2">
+                    <span v-if="workflow.version !== undefined" class="mb-1">
+                        <FontAwesomeIcon :icon="faSitemap" />
+                        Workflow Version: {{ workflow.version + 1 }}
+                    </span>
+                    <WorkflowInvocationsCount class="float-right" :workflow="workflow" />
+                </div>
+                <BButtonGroup vertical>
+                    <BButton
+                        v-b-tooltip.hover.noninteractive.html
+                        :title="
+                            !workflow.deleted
+                                ? `<b>Edit</b><br>${getWorkflowName()}`
+                                : 'This workflow has been deleted.'
+                        "
+                        size="sm"
+                        variant="secondary"
+                        :disabled="workflow.deleted"
+                        :to="`/workflows/edit?id=${workflow.id}&version=${workflow.version}`">
+                        <FontAwesomeIcon :icon="faEdit" />
+                        <span v-localize>Edit</span>
+                    </BButton>
+                    <WorkflowRunButton
+                        :id="workflow.id || ''"
+                        :title="
+                            !workflow.deleted
+                                ? `<b>Rerun</b><br>${getWorkflowName()}`
+                                : 'This workflow has been deleted.'
+                        "
+                        :disabled="workflow.deleted"
+                        full
+                        :version="workflow.version" />
+                </BButtonGroup>
+            </div>
+        </div>
+    </div>
+</template>
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.test.js b/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.test.js
index f4e069fb3cc7..ab154ae17813 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.test.js
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.test.js
@@ -1,5 +1,6 @@
 import { createTestingPinia } from "@pinia/testing";
 import { shallowMount } from "@vue/test-utils";
+import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
 
 import invocationData from "../Workflow/test/json/invocation.json";
@@ -7,6 +8,42 @@ import WorkflowInvocationOverview from "./WorkflowInvocationOverview";
 
 const localVue = getLocalVue();
 
+// Constants
+const workflowData = {
+    id: "workflow-id",
+    name: "Test Workflow",
+    version: 0,
+};
+const selectors = {
+    bAlertStub: "balert-stub",
+};
+const alertMessages = {
+    unOwned: "Workflow is neither importable, nor owned by or shared with current user",
+    nonExistent: "No workflow found for this invocation.",
+};
+
+// Mock the workflow store to return the expected workflow data given the stored workflow ID
+jest.mock("@/stores/workflowStore", () => {
+    const originalModule = jest.requireActual("@/stores/workflowStore");
+    return {
+        ...originalModule,
+        useWorkflowStore: () => ({
+            ...originalModule.useWorkflowStore(),
+            getStoredWorkflowByInstanceId: jest.fn().mockImplementation((workflowId) => {
+                if (["unowned-workflow", "nonexistant-workflow"].includes(workflowId)) {
+                    return undefined;
+                }
+                return workflowData;
+            }),
+            fetchWorkflowForInstanceId: jest.fn().mockImplementation((workflowId) => {
+                if (workflowId === "unowned-workflow") {
+                    throw new Error(alertMessages.unOwned);
+                }
+            }),
+        }),
+    };
+});
+
 describe("WorkflowInvocationOverview.vue with terminal invocation", () => {
     let wrapper;
     let propsData;
@@ -61,3 +98,39 @@ describe("WorkflowInvocationOverview.vue with invocation scheduling running", ()
         expect(wrapper.find(".cancel-workflow-scheduling").exists()).toBeTruthy();
     });
 });
+
+describe("WorkflowInvocationOverview.vue for a valid/invalid workflow", () => {
+    async function loadWrapper(invocationData) {
+        const propsData = {
+            invocation: invocationData,
+            invocationAndJobTerminal: true,
+            invocationSchedulingTerminal: true,
+            jobStatesSummary: {},
+        };
+        const wrapper = shallowMount(WorkflowInvocationOverview, {
+            propsData,
+            localVue,
+        });
+        await flushPromises();
+        return wrapper;
+    }
+
+    it("displays the workflow invocation graph for a valid workflow", async () => {
+        const wrapper = await loadWrapper(invocationData);
+        expect(wrapper.find("[data-description='workflow invocation graph']").exists()).toBeTruthy();
+    });
+
+    it("displays an alert for an unowned workflow", async () => {
+        const wrapper = await loadWrapper({ ...invocationData, workflow_id: "unowned-workflow" });
+        expect(wrapper.find("[data-description='workflow invocation graph']").exists()).toBeFalsy();
+        const alert = wrapper.find(selectors.bAlertStub);
+        expect(alert.text()).toContain(alertMessages.unOwned);
+    });
+
+    it("displays an alert for a nonexistant workflow", async () => {
+        const wrapper = await loadWrapper({ ...invocationData, workflow_id: "nonexistant-workflow" });
+        expect(wrapper.find("[data-description='workflow invocation graph']").exists()).toBeFalsy();
+        const alert = wrapper.find(selectors.bAlertStub);
+        expect(alert.text()).toContain(alertMessages.nonExistent);
+    });
+});
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.vue
index ae69835b6479..bf04dd5ce80c 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationOverview.vue
@@ -27,7 +27,7 @@ function getUrl(path: string): string {
 }
 
 interface Props {
-    invocation?: WorkflowInvocationElementView;
+    invocation: WorkflowInvocationElementView;
     invocationAndJobTerminal: boolean;
     invocationSchedulingTerminal: boolean;
     isFullPage?: boolean;
@@ -40,9 +40,9 @@ const props = defineProps<Props>();
 
 const generatePdfTooltip = "Generate PDF report for this workflow invocation";
 
-const { workflow } = useWorkflowInstance(props.invocation?.workflow_id ?? "");
+const { workflow, loading, error } = useWorkflowInstance(props.invocation.workflow_id);
 
-const invocationId = computed<string | undefined>(() => props.invocation?.id);
+const invocationId = computed<string | undefined>(() => props.invocation.id);
 
 const indexStr = computed(() => {
     if (props.index == undefined) {
@@ -53,7 +53,7 @@ const indexStr = computed(() => {
 });
 
 const invocationState = computed(() => {
-    return props.invocation?.state || "new";
+    return props.invocation.state || "new";
 });
 
 const invocationStateSuccess = computed(() => {
@@ -73,17 +73,14 @@ const disabledReportTooltip = computed(() => {
 });
 
 const stepCount = computed<number>(() => {
-    return props.invocation?.steps.length || 0;
+    return props.invocation.steps.length || 0;
 });
 
 type StepStateType = { [state: string]: number };
 
 const stepStates = computed<StepStateType>(() => {
     const stepStates: StepStateType = {};
-    if (!props.invocation) {
-        return {};
-    }
-    const steps: InvocationStep[] = props.invocation?.steps || [];
+    const steps: InvocationStep[] = props.invocation.steps || [];
     for (const step of steps) {
         if (!step) {
             continue;
@@ -108,8 +105,10 @@ const invocationPdfLink = computed<string | null>(() => {
     }
 });
 
-const hasMessages = computed<boolean>(() => {
-    return props.invocation?.messages.length ? true : false;
+const uniqueMessages = computed(() => {
+    const messages = props.invocation.messages || [];
+    const uniqueMessagesSet = new Set(messages.map((message) => JSON.stringify(message)));
+    return Array.from(uniqueMessagesSet).map((message) => JSON.parse(message)) as typeof messages;
 });
 
 const stepStatesStr = computed<string>(() => {
@@ -155,6 +154,12 @@ function onCancel() {
 
 <template>
     <div class="mb-3 workflow-invocation-state-component">
+        <BAlert v-if="isSubworkflow" variant="secondary" show>
+            This subworkflow is
+            <HelpText :uri="`galaxy.invocations.states.${invocation.state}`" :text="invocation.state" />.
+            <ExternalLink :href="withPrefix(`/workflows/invocations/${invocation.id}`)"> Click here </ExternalLink>
+            to view this subworkflow in graph view.
+        </BAlert>
         <div v-if="!invocationAndJobTerminal">
             <BAlert variant="info" show>
                 <LoadingSpan :message="`Waiting to complete invocation ${indexStr}`" />
@@ -169,14 +174,14 @@ function onCancel() {
             </BButton>
         </div>
         <div class="d-flex align-items-center">
-            <div v-if="invocationAndJobTerminal" class="mr-1" :class="{ 'd-flex': !hasMessages }">
+            <div v-if="invocationAndJobTerminal" class="mr-1" :class="{ 'd-flex': !uniqueMessages.length }">
                 <BButton
                     v-b-tooltip.hover
                     :title="invocationStateSuccess ? generatePdfTooltip : disabledReportTooltip"
                     :disabled="!invocationStateSuccess"
                     size="sm"
                     class="invocation-pdf-link text-nowrap w-100"
-                    :class="{ 'mt-1': hasMessages }"
+                    :class="{ 'mt-1': uniqueMessages.length }"
                     :href="invocationPdfLink"
                     target="_blank">
                     Generate PDF
@@ -188,9 +193,9 @@ function onCancel() {
                     note="Loading step state summary..."
                     :loading="true"
                     class="steps-progress" />
-                <template v-if="invocation && hasMessages">
+                <template v-if="uniqueMessages.length">
                     <InvocationMessage
-                        v-for="message in invocation.messages"
+                        v-for="message in uniqueMessages"
                         :key="message.reason"
                         class="steps-progress my-1"
                         :invocation-message="message"
@@ -225,24 +230,24 @@ function onCancel() {
                     class="jobs-progress" />
             </div>
         </div>
-        <!-- An invocation has been loaded, display the graph -->
-        <div v-if="invocation">
-            <div v-if="workflow && !isSubworkflow">
-                <InvocationGraph
-                    class="mt-1"
-                    :invocation="invocation"
-                    :workflow="workflow"
-                    :is-terminal="invocationAndJobTerminal"
-                    :is-scheduled="invocationSchedulingTerminal"
-                    :is-full-page="isFullPage"
-                    :show-minimap="isFullPage" />
-            </div>
-            <BAlert v-else-if="isSubworkflow" variant="secondary" show>
-                This subworkflow is
-                <HelpText :uri="`galaxy.invocations.states.${invocation.state}`" :text="invocation.state" />.
-                <ExternalLink :href="withPrefix(`/workflows/invocations/${invocation.id}`)"> Click here </ExternalLink>
-                to view this subworkflow in graph view.
-            </BAlert>
+        <!-- Once the workflow for the invocation has been loaded, display the graph -->
+        <BAlert v-if="loading" variant="info" show>
+            <LoadingSpan message="Loading workflow..." />
+        </BAlert>
+        <BAlert v-else-if="error" variant="danger" show>
+            {{ error }}
+        </BAlert>
+        <div v-else-if="workflow && !isSubworkflow">
+            <InvocationGraph
+                class="mt-1"
+                data-description="workflow invocation graph"
+                :invocation="invocation"
+                :workflow="workflow"
+                :is-terminal="invocationAndJobTerminal"
+                :is-scheduled="invocationSchedulingTerminal"
+                :is-full-page="isFullPage"
+                :show-minimap="isFullPage" />
         </div>
+        <BAlert v-else-if="!workflow" variant="info" show> No workflow found for this invocation. </BAlert>
     </div>
 </template>
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.test.ts b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.test.ts
index 93b3a22c9b09..63ed137bb97f 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.test.ts
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.test.ts
@@ -1,5 +1,5 @@
 import { createTestingPinia } from "@pinia/testing";
-import { mount, shallowMount, Wrapper } from "@vue/test-utils";
+import { shallowMount, Wrapper } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { PiniaVuePlugin, setActivePinia } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
@@ -13,6 +13,10 @@ localVue.use(PiniaVuePlugin);
 
 const selectors = {
     invocationSummary: ".invocation-overview",
+    bAlertStub: "balert-stub",
+    spanElement: "span",
+    invocationReportTab: "btab-stub[title='Report']",
+    fullPageHeading: "anonymous-stub[h1='true']",
 };
 
 /** Invocation data to be expected in the store */
@@ -75,32 +79,42 @@ jest.mock("@/stores/invocationStore", () => {
     };
 });
 
+// Mock the workflow store to return a workflow for `getStoredWorkflowByInstanceId`
+jest.mock("@/stores/workflowStore", () => {
+    const originalModule = jest.requireActual("@/stores/workflowStore");
+    return {
+        ...originalModule,
+        useWorkflowStore: () => ({
+            ...originalModule.useWorkflowStore(),
+            getStoredWorkflowByInstanceId: jest.fn().mockImplementation(() => {
+                return {
+                    id: "workflow-id",
+                    name: "Test Workflow",
+                    version: 0,
+                };
+            }),
+        }),
+    };
+});
+
 /** Mount the WorkflowInvocationState component with the given invocation ID
  * @param invocationId The invocation ID to be passed as a prop
+ * @param shallow Whether to use shallowMount or mount
+ * @param fullPage Whether to render the header as well or just the invocation state tabs
  * @returns The mounted wrapper
  */
-async function mountWorkflowInvocationState(invocationId: string, shallow = true) {
+async function mountWorkflowInvocationState(invocationId: string, isFullPage = false) {
     const pinia = createTestingPinia();
     setActivePinia(pinia);
 
-    let wrapper;
-    if (shallow) {
-        wrapper = shallowMount(WorkflowInvocationState as object, {
-            propsData: {
-                invocationId,
-            },
-            pinia,
-            localVue,
-        });
-    } else {
-        wrapper = mount(WorkflowInvocationState as object, {
-            propsData: {
-                invocationId,
-            },
-            pinia,
-            localVue,
-        });
-    }
+    const wrapper = shallowMount(WorkflowInvocationState as object, {
+        propsData: {
+            invocationId,
+            isFullPage,
+        },
+        pinia,
+        localVue,
+    });
     await flushPromises();
     return wrapper;
 }
@@ -124,9 +138,9 @@ describe("WorkflowInvocationState check invocation and job terminal states", ()
         assertJobsSummaryFetched(0);
 
         // expect there to be an alert for the missing invocation
-        const alert = wrapper.find("balert-stub");
+        const alert = wrapper.find(selectors.bAlertStub);
         expect(alert.attributes("variant")).toBe("info");
-        const span = alert.find("span");
+        const span = alert.find(selectors.spanElement);
         expect(span.text()).toBe("Invocation not found.");
     });
 
@@ -157,22 +171,22 @@ describe("WorkflowInvocationState check invocation and job terminal states", ()
         assertJobsSummaryFetched(0);
 
         // expect there to be an alert for the handled error
-        const alert = wrapper.find("balert-stub");
+        const alert = wrapper.find(selectors.bAlertStub);
         expect(alert.attributes("variant")).toBe("danger");
         expect(alert.text()).toBe("User does not own specified item.");
     });
 });
 
-describe("WorkflowInvocationState check 'Report' tab disabled state", () => {
+describe("WorkflowInvocationState check 'Report' tab disabled state and header", () => {
     it("determines that 'Report' tab is disabled for non-terminal invocation", async () => {
-        const wrapper = await mountWorkflowInvocationState("non-terminal-id", false);
-        const reportTab = wrapper.find(".invocation-report-tab").find(".nav-link");
-        expect(reportTab.classes()).toContain("disabled");
+        const wrapper = await mountWorkflowInvocationState("non-terminal-id");
+        const reportTab = wrapper.find(selectors.invocationReportTab);
+        expect(reportTab.attributes("disabled")).toBe("true");
     });
     it("determines that 'Report' tab is not disabled for terminal invocation", async () => {
-        const wrapper = await mountWorkflowInvocationState(invocationData.id, false);
-        const reportTab = wrapper.find(".invocation-report-tab").find(".nav-link");
-        expect(reportTab.classes()).not.toContain("disabled");
+        const wrapper = await mountWorkflowInvocationState(invocationData.id);
+        const reportTab = wrapper.find(selectors.invocationReportTab);
+        expect(reportTab.attributes("disabled")).toBeUndefined();
     });
 });
 
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
index b1e590cd203d..e035bc9b7dbe 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
@@ -1,34 +1,23 @@
 <script setup lang="ts">
-import { library } from "@fortawesome/fontawesome-svg-core";
-import { faArrowLeft, faClock, faEdit, faEye, faHdd, faPlay, faSitemap } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { BAlert, BButton, BButtonGroup, BTab, BTabs } from "bootstrap-vue";
-import { computed, onMounted, onUnmounted, ref, watch } from "vue";
+import { BAlert, BTab, BTabs } from "bootstrap-vue";
+import { computed, onUnmounted, ref, watch } from "vue";
 
 import { type InvocationJobsSummary, type WorkflowInvocationElementView } from "@/api/invocations";
-import type { StoredWorkflowDetailed } from "@/api/workflows";
 import { useAnimationFrameResizeObserver } from "@/composables/sensors/animationFrameResizeObserver";
 import { useInvocationStore } from "@/stores/invocationStore";
 import { useWorkflowStore } from "@/stores/workflowStore";
-import localize from "@/utils/localization";
 import { errorMessageAsString } from "@/utils/simple-error";
 
 import { cancelWorkflowScheduling } from "./services";
 import { isTerminal, jobCount, runningCount } from "./util";
 
-import Heading from "../Common/Heading.vue";
-import SwitchToHistoryLink from "../History/SwitchToHistoryLink.vue";
-import UtcDate from "../UtcDate.vue";
 import InvocationReport from "../Workflow/InvocationReport.vue";
-import WorkflowInvocationsCount from "../Workflow/WorkflowInvocationsCount.vue";
-import WorkflowRunButton from "../Workflow/WorkflowRunButton.vue";
 import WorkflowInvocationExportOptions from "./WorkflowInvocationExportOptions.vue";
+import WorkflowInvocationHeader from "./WorkflowInvocationHeader.vue";
 import WorkflowInvocationInputOutputTabs from "./WorkflowInvocationInputOutputTabs.vue";
 import WorkflowInvocationOverview from "./WorkflowInvocationOverview.vue";
 import LoadingSpan from "@/components/LoadingSpan.vue";
 
-library.add(faArrowLeft, faClock, faEdit, faEye, faHdd, faPlay, faSitemap);
-
 interface Props {
     invocationId: string;
     index?: number;
@@ -50,7 +39,7 @@ const invocationStore = useInvocationStore();
 
 const stepStatesInterval = ref<any>(undefined);
 const jobStatesInterval = ref<any>(undefined);
-const initialLoading = ref(true);
+const invocationLoaded = ref(false);
 const errorMessage = ref<string | null>(null);
 
 // after the report tab is first activated, no longer lazy-render it from then on
@@ -73,7 +62,7 @@ useAnimationFrameResizeObserver(scrollableDiv, ({ clientSize, scrollSize }) => {
 });
 
 const invocation = computed(() =>
-    !initialLoading.value && !errorMessage.value
+    invocationLoaded.value
         ? (invocationStore.getInvocationById(props.invocationId) as WorkflowInvocationElementView)
         : null
 );
@@ -107,23 +96,24 @@ const invocationStateSuccess = computed(() => {
 
 const workflowStore = useWorkflowStore();
 
-const isDeletedWorkflow = computed(() => getWorkflow()?.deleted === true);
-const workflowVersion = computed(() => getWorkflow()?.version);
-
-onMounted(async () => {
-    try {
-        await invocationStore.fetchInvocationForId({ id: props.invocationId });
-        initialLoading.value = false;
-        if (invocation.value) {
-            await pollStepStatesUntilTerminal();
-            await pollJobStatesUntilTerminal();
+watch(
+    () => props.invocationId,
+    async (id) => {
+        invocationLoaded.value = false;
+        try {
+            await invocationStore.fetchInvocationForId({ id });
+            invocationLoaded.value = true;
+            // Only start polling if there is a valid invocation
+            if (invocation.value) {
+                await pollStepStatesUntilTerminal();
+                await pollJobStatesUntilTerminal();
+            }
+        } catch (e) {
+            errorMessage.value = errorMessageAsString(e);
         }
-    } catch (e) {
-        errorMessage.value = errorMessageAsString(e);
-    } finally {
-        initialLoading.value = false;
-    }
-});
+    },
+    { immediate: true }
+);
 
 onUnmounted(() => {
     clearTimeout(stepStatesInterval.value);
@@ -151,93 +141,11 @@ function onCancel() {
 function cancelWorkflowSchedulingLocal() {
     cancelWorkflowScheduling(props.invocationId).then(onCancel).catch(onError);
 }
-
-function getWorkflow() {
-    return invocation.value?.workflow_id
-        ? (workflowStore.getStoredWorkflowByInstanceId(
-              invocation.value?.workflow_id
-          ) as unknown as StoredWorkflowDetailed)
-        : undefined;
-}
-
-function getWorkflowId() {
-    return invocation.value?.workflow_id
-        ? workflowStore.getStoredWorkflowIdByInstanceId(invocation.value?.workflow_id)
-        : undefined;
-}
-
-function getWorkflowName() {
-    return workflowStore.getStoredWorkflowNameByInstanceId(invocation.value?.workflow_id || "");
-}
 </script>
 
 <template>
     <div v-if="invocation" class="d-flex flex-column w-100">
-        <div v-if="props.isFullPage" class="d-flex flex-gapx-1">
-            <Heading h1 separator inline truncate size="xl" class="flex-grow-1">
-                Invoked Workflow: "{{ getWorkflowName() }}"
-            </Heading>
-
-            <div v-if="!props.fromPanel">
-                <BButton
-                    v-b-tooltip.hover.noninteractive
-                    :title="localize('Return to Invocations List')"
-                    class="text-nowrap"
-                    size="sm"
-                    variant="outline-primary"
-                    to="/workflows/invocations">
-                    <FontAwesomeIcon :icon="faArrowLeft" class="mr-1" />
-                    <span v-localize>Invocations List</span>
-                </BButton>
-            </div>
-        </div>
-        <div v-if="props.isFullPage" class="py-2 pl-3 d-flex justify-content-between align-items-center">
-            <div>
-                <i>
-                    <FontAwesomeIcon :icon="faClock" class="mr-1" />invoked
-                    <UtcDate :date="invocation.update_time" mode="elapsed" />
-                </i>
-                <span class="d-flex flex-gapx-1 align-items-center">
-                    <FontAwesomeIcon :icon="faHdd" />History:
-                    <SwitchToHistoryLink :history-id="invocation.history_id" />
-                </span>
-            </div>
-            <div v-if="getWorkflow()" class="d-flex flex-gapx-1 align-items-center">
-                <div class="d-flex flex-column align-items-end mr-2">
-                    <span v-if="workflowVersion !== undefined" class="mb-1">
-                        <FontAwesomeIcon :icon="faSitemap" />
-                        Workflow Version: {{ workflowVersion + 1 }}
-                    </span>
-                    <WorkflowInvocationsCount class="float-right" :workflow="getWorkflow()" />
-                </div>
-                <BButtonGroup vertical>
-                    <BButton
-                        v-b-tooltip.hover.noninteractive.html
-                        :title="
-                            !isDeletedWorkflow
-                                ? `<b>Edit</b><br>${getWorkflowName()}`
-                                : 'This workflow has been deleted.'
-                        "
-                        size="sm"
-                        variant="secondary"
-                        :disabled="isDeletedWorkflow"
-                        :to="`/workflows/edit?id=${getWorkflowId()}&version=${workflowVersion}`">
-                        <FontAwesomeIcon :icon="faEdit" />
-                        <span v-localize>Edit</span>
-                    </BButton>
-                    <WorkflowRunButton
-                        :id="getWorkflowId() || ''"
-                        :title="
-                            !isDeletedWorkflow
-                                ? `<b>Rerun</b><br>${getWorkflowName()}`
-                                : 'This workflow has been deleted.'
-                        "
-                        :disabled="isDeletedWorkflow"
-                        full
-                        :version="workflowVersion" />
-                </BButtonGroup>
-            </div>
-        </div>
+        <WorkflowInvocationHeader v-if="props.isFullPage" :invocation="invocation" :from-panel="props.fromPanel" />
         <BTabs
             ref="invocationTabs"
             class="mt-1 d-flex flex-column overflow-auto"
@@ -259,9 +167,12 @@ function getWorkflowName() {
                 <p>TODO: Insert readonly version of workflow editor here</p>
             </BTab> -->
             <BTab
+                v-if="!props.isSubworkflow"
                 title="Report"
                 title-item-class="invocation-report-tab"
-                :disabled="!invocationStateSuccess"
+                :disabled="
+                    !invocationStateSuccess || !workflowStore.getStoredWorkflowByInstanceId(invocation.workflow_id)
+                "
                 :lazy="reportLazy"
                 :active.sync="reportActive">
                 <InvocationReport v-if="invocationStateSuccess" :invocation-id="invocation.id" />
@@ -276,12 +187,12 @@ function getWorkflowName() {
             </BTab>
         </BTabs>
     </div>
-    <BAlert v-else-if="initialLoading" variant="info" show>
-        <LoadingSpan message="Loading invocation" />
-    </BAlert>
     <BAlert v-else-if="errorMessage" variant="danger" show>
         {{ errorMessage }}
     </BAlert>
+    <BAlert v-else-if="!invocationLoaded" variant="info" show>
+        <LoadingSpan message="Loading invocation" />
+    </BAlert>
     <BAlert v-else variant="info" show>
         <span v-localize>Invocation not found.</span>
     </BAlert>
diff --git a/client/src/components/WorkflowInvocationState/WorkflowStepTitle.vue b/client/src/components/WorkflowInvocationState/WorkflowStepTitle.vue
index 1253d73e3e40..3735415dd586 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowStepTitle.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowStepTitle.vue
@@ -1,8 +1,11 @@
 <script setup lang="ts">
-import { computed, watch } from "vue";
+import { faExclamationCircle } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { computed, ref, watch } from "vue";
 
 import { useToolStore } from "@/stores/toolStore";
 import { useWorkflowStore } from "@/stores/workflowStore";
+import { errorMessageAsString } from "@/utils/simple-error";
 
 interface WorkflowInvocationStepTitleProps {
     stepIndex: number;
@@ -54,26 +57,36 @@ const title = computed(() => {
             return `Step ${oneBasedStepIndex}: Unknown step type '${workflowStepType}'`;
     }
 });
+const hoverError = ref("");
 
-function initStores() {
+async function initStores() {
     if (props.stepToolId && !toolStore.getToolForId(props.stepToolId)) {
         toolStore.fetchToolForId(props.stepToolId);
     }
 
     if (props.stepSubworkflowId) {
-        workflowStore.fetchWorkflowForInstanceId(props.stepSubworkflowId);
+        try {
+            await workflowStore.fetchWorkflowForInstanceId(props.stepSubworkflowId);
+        } catch (e) {
+            hoverError.value = errorMessageAsString(e, "Error fetching subworkflow");
+        }
     }
 }
 
 watch(
     props,
-    () => {
-        initStores();
+    async () => {
+        await initStores();
     },
     { immediate: true }
 );
 </script>
 
 <template>
-    <span>{{ title }}</span>
+    <span>
+        {{ title }}
+        <span v-b-tooltip.noninteractive.hover.v-danger :title="hoverError">
+            <FontAwesomeIcon v-if="hoverError" class="text-danger" :icon="faExclamationCircle" />
+        </span>
+    </span>
 </template>
diff --git a/client/src/components/WorkflowInvocationState/invocationMessageModel.ts b/client/src/components/WorkflowInvocationState/invocationMessageModel.ts
deleted file mode 100644
index 29ab6a989847..000000000000
--- a/client/src/components/WorkflowInvocationState/invocationMessageModel.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
-/* This file was automatically generated from pydantic models by running pydantic2ts.
-/* Do not modify it by hand - just update the pydantic models and then re-run the script
-*/
-
-export type InvocationMessageResponseModel =
-    | GenericInvocationCancellationReviewFailedEncodedDatabaseIdField
-    | GenericInvocationCancellationHistoryDeletedEncodedDatabaseIdField
-    | GenericInvocationCancellationUserRequestEncodedDatabaseIdField
-    | GenericInvocationFailureDatasetFailedEncodedDatabaseIdField
-    | GenericInvocationFailureCollectionFailedEncodedDatabaseIdField
-    | GenericInvocationFailureJobFailedEncodedDatabaseIdField
-    | GenericInvocationFailureOutputNotFoundEncodedDatabaseIdField
-    | GenericInvocationFailureExpressionEvaluationFailedEncodedDatabaseIdField
-    | GenericInvocationFailureWhenNotBooleanEncodedDatabaseIdField
-    | GenericInvocationUnexpectedFailureEncodedDatabaseIdField
-    | GenericInvocationEvaluationWarningWorkflowOutputNotFoundEncodedDatabaseIdField;
-
-export interface GenericInvocationCancellationHistoryDeletedEncodedDatabaseIdField {
-    reason: "history_deleted";
-    /**
-     * History ID of history that was deleted.
-     */
-    history_id: string;
-}
-export interface GenericInvocationCancellationHistoryDeletedInt {
-    reason: "history_deleted";
-    /**
-     * History ID of history that was deleted.
-     */
-    history_id: number;
-}
-export interface GenericInvocationCancellationReviewFailedEncodedDatabaseIdField {
-    reason: "cancelled_on_review";
-    /**
-     * Workflow step id of paused step that did not pass review.
-     */
-    workflow_step_id: number;
-}
-export interface GenericInvocationCancellationReviewFailedInt {
-    reason: "cancelled_on_review";
-    /**
-     * Workflow step id of paused step that did not pass review.
-     */
-    workflow_step_id: number;
-}
-export interface GenericInvocationCancellationUserRequestEncodedDatabaseIdField {
-    reason: "user_request";
-}
-export interface GenericInvocationCancellationUserRequestInt {
-    reason: "user_request";
-}
-export interface GenericInvocationEvaluationWarningWorkflowOutputNotFoundEncodedDatabaseIdField {
-    reason: "workflow_output_not_found";
-    workflow_step_id: number;
-    /**
-     * Output that was designated as workflow output but that has not been found
-     */
-    output_name: string;
-}
-export interface GenericInvocationEvaluationWarningWorkflowOutputNotFoundInt {
-    reason: "workflow_output_not_found";
-    workflow_step_id: number;
-    /**
-     * Output that was designated as workflow output but that has not been found
-     */
-    output_name: string;
-}
-export interface GenericInvocationFailureCollectionFailedEncodedDatabaseIdField {
-    reason: "collection_failed";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    /**
-     * HistoryDatasetCollectionAssociation ID that relates to failure.
-     */
-    hdca_id: string;
-    /**
-     * Workflow step id of step that caused failure.
-     */
-    dependent_workflow_step_id: number;
-}
-export interface GenericInvocationFailureCollectionFailedInt {
-    reason: "collection_failed";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    /**
-     * HistoryDatasetCollectionAssociation ID that relates to failure.
-     */
-    hdca_id: number;
-    /**
-     * Workflow step id of step that caused failure.
-     */
-    dependent_workflow_step_id: number;
-}
-export interface GenericInvocationFailureDatasetFailedEncodedDatabaseIdField {
-    reason: "dataset_failed";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    /**
-     * HistoryDatasetAssociation ID that relates to failure.
-     */
-    hda_id: string;
-    /**
-     * Workflow step id of step that caused failure.
-     */
-    dependent_workflow_step_id?: number;
-}
-export interface GenericInvocationFailureDatasetFailedInt {
-    reason: "dataset_failed";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    /**
-     * HistoryDatasetAssociation ID that relates to failure.
-     */
-    hda_id: number;
-    /**
-     * Workflow step id of step that caused failure.
-     */
-    dependent_workflow_step_id?: number;
-}
-export interface GenericInvocationFailureExpressionEvaluationFailedEncodedDatabaseIdField {
-    reason: "expression_evaluation_failed";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    /**
-     * May contain details to help troubleshoot this problem.
-     */
-    details?: string;
-}
-export interface GenericInvocationFailureExpressionEvaluationFailedInt {
-    reason: "expression_evaluation_failed";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    /**
-     * May contain details to help troubleshoot this problem.
-     */
-    details?: string;
-}
-export interface GenericInvocationFailureJobFailedEncodedDatabaseIdField {
-    reason: "job_failed";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    /**
-     * Job ID that relates to failure.
-     */
-    job_id: string;
-    /**
-     * Workflow step id of step that caused failure.
-     */
-    dependent_workflow_step_id: number;
-}
-export interface GenericInvocationFailureJobFailedInt {
-    reason: "job_failed";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    /**
-     * Job ID that relates to failure.
-     */
-    job_id: number;
-    /**
-     * Workflow step id of step that caused failure.
-     */
-    dependent_workflow_step_id: number;
-}
-export interface GenericInvocationFailureOutputNotFoundEncodedDatabaseIdField {
-    reason: "output_not_found";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    output_name: string;
-    /**
-     * Workflow step id of step that caused failure.
-     */
-    dependent_workflow_step_id: number;
-}
-export interface GenericInvocationFailureOutputNotFoundInt {
-    reason: "output_not_found";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    output_name: string;
-    /**
-     * Workflow step id of step that caused failure.
-     */
-    dependent_workflow_step_id: number;
-}
-export interface GenericInvocationFailureWhenNotBooleanEncodedDatabaseIdField {
-    reason: "when_not_boolean";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    /**
-     * Contains details to help troubleshoot this problem.
-     */
-    details: string;
-}
-export interface GenericInvocationFailureWhenNotBooleanInt {
-    reason: "when_not_boolean";
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id: number;
-    /**
-     * Contains details to help troubleshoot this problem.
-     */
-    details: string;
-}
-export interface GenericInvocationUnexpectedFailureEncodedDatabaseIdField {
-    reason: "unexpected_failure";
-    /**
-     * May contains details to help troubleshoot this problem.
-     */
-    details?: string;
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id?: number;
-}
-export interface GenericInvocationUnexpectedFailureInt {
-    reason: "unexpected_failure";
-    /**
-     * May contains details to help troubleshoot this problem.
-     */
-    details?: string;
-    /**
-     * Workflow step id of step that failed.
-     */
-    workflow_step_id?: number;
-}
diff --git a/client/src/composables/useWorkflowInstance.ts b/client/src/composables/useWorkflowInstance.ts
index 426c9269bfbc..53bb6d287dee 100644
--- a/client/src/composables/useWorkflowInstance.ts
+++ b/client/src/composables/useWorkflowInstance.ts
@@ -1,11 +1,13 @@
 import { computed, ref } from "vue";
 
 import { useWorkflowStore } from "@/stores/workflowStore";
+import { errorMessageAsString } from "@/utils/simple-error";
 
 export function useWorkflowInstance(workflowId: string) {
     const workflowStore = useWorkflowStore();
     const workflow = computed(() => workflowStore.getStoredWorkflowByInstanceId(workflowId));
     const loading = ref(false);
+    const error = ref<string | null>(null);
 
     async function getWorkflowInstance() {
         if (!workflow.value) {
@@ -13,7 +15,7 @@ export function useWorkflowInstance(workflowId: string) {
             try {
                 await workflowStore.fetchWorkflowForInstanceId(workflowId);
             } catch (e) {
-                console.error("unable to fetch workflow \n", e);
+                error.value = errorMessageAsString(e);
             } finally {
                 loading.value = false;
             }
@@ -21,5 +23,5 @@ export function useWorkflowInstance(workflowId: string) {
     }
     getWorkflowInstance();
 
-    return { workflow, loading };
+    return { workflow, loading, error };
 }
diff --git a/client/src/stores/workflowStore.ts b/client/src/stores/workflowStore.ts
index b757fe868b20..2cd194a093c1 100644
--- a/client/src/stores/workflowStore.ts
+++ b/client/src/stores/workflowStore.ts
@@ -12,6 +12,7 @@ export interface Workflow {
     step_count?: number;
     latest_id?: string;
     version: number;
+    deleted?: boolean;
 }
 
 export const useWorkflowStore = defineStore("workflowStore", () => {
diff --git a/lib/galaxy/schema/invocation.py b/lib/galaxy/schema/invocation.py
index 1d433fa5584a..4d5ce80548e8 100644
--- a/lib/galaxy/schema/invocation.py
+++ b/lib/galaxy/schema/invocation.py
@@ -20,6 +20,7 @@
 from typing_extensions import (
     Annotated,
     Literal,
+    TypeAliasType,
 )
 
 from galaxy.schema import schema
@@ -253,7 +254,7 @@ class GenericInvocationEvaluationWarningWorkflowOutputNotFound(
     EncodedDatabaseIdField
 ]
 
-InvocationMessageResponseUnion = Annotated[
+_InvocationMessageResponseUnion = Annotated[
     Union[
         InvocationCancellationReviewFailedResponseModel,
         InvocationCancellationHistoryDeletedResponseModel,
@@ -270,6 +271,8 @@ class GenericInvocationEvaluationWarningWorkflowOutputNotFound(
     Field(discriminator="reason"),
 ]
 
+InvocationMessageResponseUnion = TypeAliasType("InvocationMessageResponseUnion", _InvocationMessageResponseUnion)
+
 
 class InvocationMessageResponseModel(RootModel):
     root: InvocationMessageResponseUnion