diff --git a/frontend/src/lib/components/FlowMetadata.svelte b/frontend/src/lib/components/FlowMetadata.svelte
index d0c1d0f0b8..7c1d1a7963 100644
--- a/frontend/src/lib/components/FlowMetadata.svelte
+++ b/frontend/src/lib/components/FlowMetadata.svelte
@@ -14,6 +14,7 @@
 	} from '@fortawesome/free-solid-svg-icons'
 	import ScheduleEditor from './ScheduleEditor.svelte'
 	import TimeAgo from './TimeAgo.svelte'
+	import { workspaceStore } from '$lib/stores'
 
 	export let job: Job
 	const SMALL_ICON_SCALE = 0.7
@@ -57,11 +58,15 @@
 				<Icon class="text-secondary" data={faBarsStaggered} scale={SMALL_ICON_SCALE} /><span
 					class="mx-2"
 				>
-					Step of flow <a href={`/run/${job.parent_job}`}>{job.parent_job}</a></span
+					Step of flow <a href={`/run/${job.parent_job}?workspace=${$workspaceStore}`}
+						>{job.parent_job}</a
+					></span
 				>
 			{:else}
 				<Icon class="text-secondary" data={faRobot} scale={SMALL_ICON_SCALE} /><span class="mx-2">
-					Triggered by parent <a href={`/run/${job.parent_job}`}>{job.parent_job}</a></span
+					Triggered by parent <a href={`/run/${job.parent_job}?workspace=${$workspaceStore}`}
+						>{job.parent_job}</a
+					></span
 				>
 			{/if}
 		{:else if job && job.schedule_path}
diff --git a/frontend/src/lib/components/jobs/JobDetail.svelte b/frontend/src/lib/components/jobs/JobDetail.svelte
index 5caeff747f..866f5214f2 100644
--- a/frontend/src/lib/components/jobs/JobDetail.svelte
+++ b/frontend/src/lib/components/jobs/JobDetail.svelte
@@ -23,6 +23,7 @@
 	import JobPreview from './JobPreview.svelte'
 	import TimeAgo from '../TimeAgo.svelte'
 	import { forLater } from '$lib/forLater'
+	import { workspaceStore } from '$lib/stores'
 
 	const SMALL_ICON_SCALE = 0.7
 
@@ -116,7 +117,7 @@
 							</div>
 						</JobPreview>
 						<div class="whitespace-nowrap">
-							{#if 'job_kind' in job}<a href="/run/{job.id}"
+							{#if 'job_kind' in job}<a href="/run/{job.id}?workspace={job.workspace_id}"
 									><Badge color="blue">{job.job_kind}</Badge></a
 								>
 							{/if}
@@ -191,14 +192,15 @@
 							<Icon class="text-secondary" data={faBarsStaggered} scale={SMALL_ICON_SCALE} /><span
 								class="mx-1"
 							>
-								Step of flow <a href={`/run/${job.parent_job}`}>{truncateRev(job.parent_job, 6)}</a
+								Step of flow <a href={`/run/${job.parent_job}?workspace=${job.workspace_id}`}
+									>{truncateRev(job.parent_job, 6)}</a
 								></span
 							>
 						{:else}
 							<Icon class="text-secondary" data={faRobot} scale={SMALL_ICON_SCALE} /><span
 								class="mx-1"
 							>
-								Parent <a href={`/run/${job.parent_job}`}>{job.parent_job}</a></span
+								Parent <a href={`/run/${job.parent_job}?workspace=${job.workspace_id}`}>{job.parent_job}</a></span
 							>
 						{/if}
 					{:else if job && job.schedule_path}
diff --git a/frontend/src/lib/components/runs/JobPreview.svelte b/frontend/src/lib/components/runs/JobPreview.svelte
index e8b21b01c8..5a77b96d43 100644
--- a/frontend/src/lib/components/runs/JobPreview.svelte
+++ b/frontend/src/lib/components/runs/JobPreview.svelte
@@ -5,7 +5,7 @@
 	import DisplayResult from '../DisplayResult.svelte'
 	import JobArgs from '../JobArgs.svelte'
 	import LogViewer from '../LogViewer.svelte'
-	import {  msToSec } from '$lib/utils'
+	import { msToSec } from '$lib/utils'
 	import { Badge, Button, Skeleton, Tab, Tabs } from '../common'
 	import { onMount } from 'svelte'
 	import HighlightCode from '../HighlightCode.svelte'
@@ -53,7 +53,7 @@
 	<Button
 		class="flex flex-row gap-1 items-center"
 		on:click={() => {
-			goto(`/run/${job?.id}`)
+			goto(`/run/${job?.id}?workspace=${job?.workspace_id}`)
 		}}
 	>
 		<span class="font-semibold text-xs leading-6">ID:</span>
diff --git a/frontend/src/lib/components/runs/RunRow.svelte b/frontend/src/lib/components/runs/RunRow.svelte
index f2a4eabe37..8f8a1c0c10 100644
--- a/frontend/src/lib/components/runs/RunRow.svelte
+++ b/frontend/src/lib/components/runs/RunRow.svelte
@@ -157,12 +157,14 @@
 			{#if job.is_flow_step}
 				<Icon class="text-secondary" data={faBarsStaggered} scale={SMALL_ICON_SCALE} />
 				<span class="mx-1">
-					Step of flow <a href={`/run/${job.parent_job}`}>{truncateRev(job.parent_job, 6)} </a>
+					Step of flow <a href={`/run/${job.parent_job}?workspace=${job.workspace_id}`}
+						>{truncateRev(job.parent_job, 6)}
+					</a>
 				</span>
 			{:else}
 				<Icon class="text-secondary" data={faRobot} scale={SMALL_ICON_SCALE} />
 				<span class="mx-1">
-					Parent <a href={`/run/${job.parent_job}`}>{job.parent_job}</a>
+					Parent <a href={`/run/${job.parent_job}?workspace=${job.workspace_id}`}>{job.parent_job}</a>
 				</span>
 			{/if}
 		{/if}
diff --git a/frontend/src/lib/components/scriptEditor/LogPanel.svelte b/frontend/src/lib/components/scriptEditor/LogPanel.svelte
index a0bdd6551c..d1dd8dffae 100644
--- a/frontend/src/lib/components/scriptEditor/LogPanel.svelte
+++ b/frontend/src/lib/components/scriptEditor/LogPanel.svelte
@@ -137,7 +137,7 @@
 					{#each pastPreviews as { id, created_at, success, result }}
 						<tr class="">
 							<td class="text-xs">
-								<a class="pr-3" href="/run/{id}" target="_blank">{id.substring(30)}</a>
+								<a class="pr-3" href="/run/{id}?workspace={$workspaceStore}" target="_blank">{id.substring(30)}</a>
 							</td>
 							<td class="text-xs">{displayDate(created_at)}</td>
 							<td class="text-xs">
diff --git a/frontend/src/routes/(root)/(logged)/schedules/+page.svelte b/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
index af6e6cbfde..fb93e1ea62 100644
--- a/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
@@ -282,7 +282,7 @@
 								{/if}
 								{#each jobs ?? [] as job}
 									{@const h = (avg_s ? job.duration_ms / avg_s : 1) * 7 + 3}
-									<a href="/run/{job.id}">
+									<a href="/run/{job.id}?workspace={$workspaceStore}">
 										<JobPreview id={job.id}>
 											<div>
 												<div