diff --git a/frontend/src/lib/components/FlowJobResult.svelte b/frontend/src/lib/components/FlowJobResult.svelte
index 6160ebe45b..d603d72a92 100644
--- a/frontend/src/lib/components/FlowJobResult.svelte
+++ b/frontend/src/lib/components/FlowJobResult.svelte
@@ -77,7 +77,7 @@
 	class:border={!noBorder}
 	class="grid {!col
 		? 'grid-cols-2'
-		: 'grid-rows-2'} shadow border border-tertiary-inverse grow overflow-hidden"
+		: 'grid-rows-2 max-h-screen'} shadow border border-tertiary-inverse grow overflow-hidden"
 >
 	<div class="bg-surface {col ? '' : 'max-h-80'} p-1 overflow-auto relative">
 		<span class="text-tertiary">Result</span>
diff --git a/frontend/src/lib/components/FlowStatusViewerInner.svelte b/frontend/src/lib/components/FlowStatusViewerInner.svelte
index cbd1f9bfbd..d356196aa3 100644
--- a/frontend/src/lib/components/FlowStatusViewerInner.svelte
+++ b/frontend/src/lib/components/FlowStatusViewerInner.svelte
@@ -1309,7 +1309,7 @@
 								durationStatuses={localDurationStatuses}
 							/>
 						{:else if rightColumnSelect == 'node_status'}
-							<div class="pt-2 max-h-[80vh] grow flex flex-col">
+							<div class="pt-2 grow flex flex-col">
 								{#if selectedNode}
 									{@const node = $localModuleStates[selectedNode]}
 
@@ -1388,7 +1388,6 @@
 												/>
 											</div>
 										{/if}
-
 										<FlowJobResult
 											workspaceId={job?.workspace_id}
 											jobId={node.job_id}
diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
index 3c125343b7..7105094747 100644
--- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
@@ -234,13 +234,17 @@
 		}
 	}
 
-	$: {
-		if ($workspaceStore && $page.params.run && testJobLoader) {
-			forceCancel = false
-			getJob()
-		}
+	function onRunsPageChangeWithLoader() {
+		forceCancel = false
+		getJob()
 	}
 
+	function onRunsPageChange() {
+		job = undefined
+	}
+	$: $workspaceStore && $page.params.run && onRunsPageChange()
+	$: $workspaceStore && $page.params.run && testJobLoader && onRunsPageChangeWithLoader()
+
 	$: selectedJobStep !== undefined && onSelectedJobStepChange()
 	$: job && onJobLoaded()
 
@@ -342,7 +346,6 @@
 						path: job.script_path!
 					})
 				}
-				job = undefined
 
 				await goto('/run/' + id + '?workspace=' + $workspaceStore)
 			} else {
@@ -389,7 +392,7 @@
 		</DrawerContent>
 	</Drawer>
 {/if}
-{#if job?.job_kind != 'flow' && job?.job_kind != 'flownode' && job?.job_kind != 'flowpreview'}
+{#if !job || (job?.job_kind != 'flow' && job?.job_kind != 'flownode' && job?.job_kind != 'flowpreview')}
 	<TestJobLoader
 		lazyLogs
 		bind:scriptProgress