diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue
index 71402064b..b8c181667 100644
--- a/src/components/graph/GraphCanvas.vue
+++ b/src/components/graph/GraphCanvas.vue
@@ -65,7 +65,7 @@ import { useLitegraphService } from '@/services/litegraphService'
 import { useWorkflowService } from '@/services/workflowService'
 import { useCommandStore } from '@/stores/commandStore'
 import { useCanvasStore } from '@/stores/graphStore'
-import { ComfyModelDef } from '@/stores/modelStore'
+import { ComfyModelDef, useModelStore } from '@/stores/modelStore'
 import {
   ModelNodeProvider,
   useModelToNodeStore
@@ -360,6 +360,56 @@ const loadCustomNodesI18n = async () => {
   }
 }
 
+const loadWorkflowFromStorage = async (json: string, workflowName: string) => {
+  if (!json) return false
+  const workflow = JSON.parse(json)
+  await comfyApp.loadGraphData(workflow, true, true, workflowName)
+  return true
+}
+
+const loadPreviousWorkflowFromStorage = async () => {
+  const workflowName = getStorageValue('Comfy.PreviousWorkflow')
+  const clientId = api.initialClientId ?? api.clientId
+
+  // Try loading from session storage first
+  if (clientId) {
+    const sessionWorkflow = sessionStorage.getItem(`workflow:${clientId}`)
+    if (await loadWorkflowFromStorage(sessionWorkflow, workflowName)) {
+      return true
+    }
+  }
+
+  // Fall back to local storage
+  const localWorkflow = localStorage.getItem('workflow')
+  return await loadWorkflowFromStorage(localWorkflow, workflowName)
+}
+
+const loadDefaultWorkflow = async () => {
+  const settingStore = useSettingStore()
+
+  if (!settingStore.get('Comfy.TutorialCompleted')) {
+    await settingStore.set('Comfy.TutorialCompleted', true)
+    // Load model folders to ensure the missing models' corresponding folders
+    // can be correctly identified.
+    await useModelStore().loadModelFolders()
+    await useWorkflowService().loadTutorialWorkflow()
+  } else {
+    await comfyApp.loadGraphData()
+  }
+}
+
+const restorePreviousWorkflow = async () => {
+  try {
+    const restored = await loadPreviousWorkflowFromStorage()
+    if (!restored) {
+      await loadDefaultWorkflow()
+    }
+  } catch (err) {
+    console.error('Error loading previous workflow', err)
+    await loadDefaultWorkflow()
+  }
+}
+
 const comfyAppReady = ref(false)
 onMounted(async () => {
   // Backward compatible
@@ -400,6 +450,8 @@ onMounted(async () => {
     'Comfy.CustomColorPalettes'
   )
 
+  // Restore workflow from storage
+  await restorePreviousWorkflow()
   const isRestorable = storedWorkflows?.length > 0 && storedActiveIndex >= 0
   if (isRestorable)
     workflowStore.openWorkflowsInBackground({
diff --git a/src/scripts/app.ts b/src/scripts/app.ts
index c383fb82d..47c0b23f4 100644
--- a/src/scripts/app.ts
+++ b/src/scripts/app.ts
@@ -1037,44 +1037,6 @@ export class ComfyApp {
     await useExtensionService().invokeExtensionsAsync('init')
     await this.registerNodes()
 
-    // Load previous workflow
-    let restored = false
-    try {
-      const loadWorkflow = async (json) => {
-        if (json) {
-          const workflow = JSON.parse(json)
-          const workflowName = getStorageValue('Comfy.PreviousWorkflow')
-          await this.loadGraphData(workflow, true, true, workflowName)
-          return true
-        }
-      }
-      const clientId = api.initialClientId ?? api.clientId
-      restored =
-        (clientId &&
-          (await loadWorkflow(
-            sessionStorage.getItem(`workflow:${clientId}`)
-          ))) ||
-        (await loadWorkflow(localStorage.getItem('workflow')))
-    } catch (err) {
-      console.error('Error loading previous workflow', err)
-    }
-
-    // We failed to restore a workflow so load the default
-    if (!restored) {
-      const settingStore = useSettingStore()
-
-      // If tutorial is not completed, load the tutorial workflow
-      if (!settingStore.get('Comfy.TutorialCompleted')) {
-        await settingStore.set('Comfy.TutorialCompleted', true)
-        // Load model folders to ensure the missing models' corresponding folders
-        // can be correctly identified.
-        await useModelStore().loadModelFolders()
-        await useWorkflowService().loadTutorialWorkflow()
-      } else {
-        await this.loadGraphData()
-      }
-    }
-
     this.#addDrawNodeHandler()
     this.#addDrawGroupsHandler()
     this.#addDropHandler()