diff --git a/webui/src/features/workflow/WorkflowPage.tsx b/webui/src/features/workflow/WorkflowPage.tsx
index cd98c29..9dda5d1 100644
--- a/webui/src/features/workflow/WorkflowPage.tsx
+++ b/webui/src/features/workflow/WorkflowPage.tsx
@@ -14,7 +14,6 @@ import {
   GitFork,
   ListChecks,
   Plus,
-  RefreshCw,
   RotateCcw,
   Save,
   Settings2,
@@ -23,7 +22,7 @@ import {
 } from "lucide-react";
 import { ReactFlowProvider } from "@xyflow/react";
 import { useSearchParams } from "react-router";
-import { ToolbarGroup, ActionToolbar,
+import { ActionToolbar,
   Button,
   ConfirmDialog,
   ContentGrid,
@@ -46,6 +45,7 @@ import { ToolbarGroup, ActionToolbar,
   StatePanel,
   StatusBadge,
   ToggleSwitch,
+  WorkspaceActionBar,
   WorkspaceFrame,
   WorkspaceLayout,
   hasScope,
@@ -111,7 +111,7 @@ export default function WorkflowPage({
   settings: ApiSettings;
   auth: AuthInfo;
 }) {
-  const { requestNavigation } = useUnsavedChanges();
+  const { requestDiscard, requestNavigation } = useUnsavedChanges();
   const [searchParams, setSearchParams] = useSearchParams();
   const requestedDefinitionId = searchParams.get("definition");
   const requestedRunId = searchParams.get("run");
@@ -606,20 +606,13 @@ export default function WorkflowPage({
         contentLabel="Workflow editor"
         contentClassName="workflow-workspace"
         primary={<>
-          <ActionToolbar surface="panel-header">
-            <strong>Workflows</strong>
-            <ToolbarGroup align="end" className="workflow-toolbar-actions">
-              <DocumentationHelpLink
-                reference={{ topicId: "workflow.editor", documentationType: "user" }}
-                label="Open Workflow documentation"
-              />
-              <IconButton
-                label="Refresh"
-                icon={<RefreshCw size={16} />}
-                variant="ghost"
-                onClick={() => void reload(draft?.id)}
-                disabled={loading || working}
-              />
+          <WorkspaceActionBar
+            scope="collection-pane"
+            variant="collection"
+            refreshable
+            reloadAction={{ onReload: () => void reload(draft?.id), loading: loading || working }}
+            contextActions={<>
+              <strong>Workflows</strong>
               {hasScope(auth, "workflow:instance:admin") ? (
                 <IconButton
                   label="Reconcile module standards"
@@ -629,16 +622,20 @@ export default function WorkflowPage({
                   disabled={loading || working}
                 />
               ) : null}
-              <IconButton
+            </>}
+            helpAction={<DocumentationHelpLink
+                reference={{ topicId: "workflow.editor", documentationType: "user" }}
+                label="Open Workflow documentation"
+            />}
+            createAction={<IconButton
                 label="New workflow"
                 icon={<Plus size={17} />}
                 variant="primary"
                 onClick={createNew}
                 disabled={!canWrite}
                 disabledReason={!canWrite ? "Workflow definition write permission is required." : undefined}
-              />
-            </ToolbarGroup>
-          </ActionToolbar>
+            />}
+          />
           <FilterBar surface="panel">
             <input
               type="search"
@@ -683,8 +680,12 @@ export default function WorkflowPage({
       >
           {draft && displayedGraph ? (
             <>
-              <ActionToolbar surface="panel-header" className="workflow-workspace-toolbar">
-                <span className="workflow-identity-fields">
+              <WorkspaceActionBar
+                scope="editor-pane"
+                variant="editor"
+                state={working ? "saving" : dirty && !draft.name.trim() ? "invalid" : dirty ? "dirty" : "clean"}
+                className="workflow-workspace-toolbar"
+                contextActions={<span className="workflow-identity-fields">
                   <input
                     className="workflow-name-input"
                     value={draft.name}
@@ -706,8 +707,8 @@ export default function WorkflowPage({
                     placeholder="Description"
                     aria-label="Workflow description"
                   />
-                </span>
-                <span className="workflow-command-bar">
+                </span>}
+                primaryActions={<span className="workflow-command-bar">
                   {draft.id ? (
                     <select
                       className="workflow-revision-select"
@@ -851,26 +852,26 @@ export default function WorkflowPage({
                       <CheckCircle2 size={16} /> Activate
                     </Button>
                   ) : null}
-                  <Button
-                    variant="primary"
-                    onClick={() => void saveDraft()}
-                    disabled={
-                      !canEdit || !dirty || working || readOnly
-                    }
-                  >
-                    <Save size={16} /> Save
-                  </Button>
-                  {draft.id && draft.standard?.kind !== "baseline" ? (
-                    <IconButton
-                      label="Delete workflow"
-                      icon={<Trash2 size={16} />}
-                      variant="danger"
-                      onClick={() => setDeleteOpen(true)}
-                      disabled={!canEdit || working}
-                    />
-                  ) : null}
-                </span>
-              </ActionToolbar>
+                </span>}
+                destructiveActions={draft.id && draft.standard?.kind !== "baseline" ? (
+                  <IconButton
+                    label="Delete workflow"
+                    icon={<Trash2 size={16} />}
+                    variant="danger"
+                    onClick={() => setDeleteOpen(true)}
+                    disabled={!canEdit || working}
+                  />
+                ) : undefined}
+                discardAction={{
+                  label: <><RotateCcw size={16} /> Discard</>,
+                  onClick: () => requestDiscard(() => void reload(draft.id))
+                }}
+                saveAction={{
+                  label: <><Save size={16} /> Save</>,
+                  onClick: () => void saveDraft(),
+                  disabled: !canEdit || readOnly
+                }}
+              />
               <div className="workflow-alerts">
                 {error ? (
                   <DismissibleAlert tone="danger" resetKey={error}>