diff --git a/src/lib/stores/full-screen.ts b/src/lib/stores/full-screen.ts
index deabf850d9..051d5cb2ee 100644
--- a/src/lib/stores/full-screen.ts
+++ b/src/lib/stores/full-screen.ts
@@ -1,23 +1,9 @@
 import { page } from '$app/stores';
-import { get, writable } from 'svelte/store';
+import { derived } from 'svelte/store';
 
-const getQueryParam = () => !!+get(page).query.has('fullScreen');
-const setQueryParam = (status: boolean): boolean => {
-  const query = new URLSearchParams();
-  if (status) {
-    query.append('fullScreen', '1');
-  } else {
-    query.delete('fullScreen');
-  }
-  history.pushState(null, '', `?${query}`);
-  return status;
-};
-
-const { subscribe, update } = writable(false, function (set) {
-  set(getQueryParam());
+export const isFullScreen = derived(page, ($page) => {
+  const { query } = $page;
+  if (!query.has('fullScreen')) return false;
+  if (query.get('fullScreen') === 'false') return false;
+  return true;
 });
-
-export const isFullScreen = {
-  subscribe,
-  toggle: (): void => update((status) => setQueryParam(!status)),
-};
diff --git a/src/routes/workflows/[workflow]/[run].svelte b/src/routes/workflows/[workflow]/[run].svelte
index 92dd331802..5103aa46b3 100644
--- a/src/routes/workflows/[workflow]/[run].svelte
+++ b/src/routes/workflows/[workflow]/[run].svelte
@@ -22,13 +22,16 @@
 <script lang="typescript">
   import { isFullScreen } from '$lib/stores/full-screen';
   import Icon, { X, ArrowsExpand } from 'svelte-hero-icons';
+  import { page } from '$app/stores';
 
   export let execution: DescribeWorkflowExecutionResponse;
 
   $: name = execution.workflowExecutionInfo.type.name;
   $: workflowId = execution.workflowExecutionInfo.execution.workflowId;
   $: runId = execution.workflowExecutionInfo.execution.runId;
-  $: workflowUrl = `/workflows/${workflowId}/${runId}`;
+  $: workflowUrl = `/workflows/${workflowId}/${runId}?${new URLSearchParams({
+    fullScreen: !$isFullScreen,
+  })}`;
 </script>
 
 <section
@@ -39,7 +42,7 @@
     <header
       class="border-b-2 border-gray-200 px-6 pb-6 flex flex-col justify-between"
     >
-      <a href={workflowUrl} on:click|preventDefault={isFullScreen.toggle}>
+      <a href={workflowUrl}>
         <Icon
           src={ArrowsExpand}
           class="absolute right-10 top-2 w-8 h-8 text-gray-400"