diff --git a/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte b/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte
index 893ed46a88..456505a4a8 100644
--- a/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte
@@ -45,6 +45,15 @@
   function testWorkflow() {
     testResult = "PASSED"
   }
+
+  async function saveWorkflow() {
+    const workflow = $workflowStore.currentWorkflow.workflow
+    await workflowStore.actions.save({
+      instanceId: $backendUiStore.selectedDatabase._id,
+      workflow,
+    })
+    notifier.success(`Workflow ${workflow.name} saved.`)
+  }
 </script>
 
 <section>
@@ -87,6 +96,9 @@
     {#if workflowBlock}
       <WorkflowBlockSetup {workflowBlock} />
       <div class="buttons">
+        <button class="workflow-button hoverable" on:click={saveWorkflow}>
+          Save Workflow
+        </button>
         <button
           class="delete-workflow-button hoverable"
           on:click={deleteWorkflowBlock}>
@@ -241,6 +253,7 @@
     font-size: 14px;
     font-weight: 500;
     transition: all 2ms;
+    margin-bottom: 10px;
   }
 
   .workflow-button:hover {
diff --git a/packages/builder/src/components/workflow/WorkflowPanel/WorkflowList/WorkflowList.svelte b/packages/builder/src/components/workflow/WorkflowPanel/WorkflowList/WorkflowList.svelte
index 6111742ea6..7ba022fb78 100644
--- a/packages/builder/src/components/workflow/WorkflowPanel/WorkflowList/WorkflowList.svelte
+++ b/packages/builder/src/components/workflow/WorkflowPanel/WorkflowList/WorkflowList.svelte
@@ -25,15 +25,6 @@
   onMount(() => {
     workflowStore.actions.fetch($backendUiStore.selectedDatabase._id)
   })
-
-  async function saveWorkflow() {
-    const workflow = $workflowStore.currentWorkflow.workflow
-    await workflowStore.actions.save({
-      instanceId: $backendUiStore.selectedDatabase._id,
-      workflow,
-    })
-    notifier.success(`Workflow ${workflow.name} saved.`)
-  }
 </script>
 
 <section>
@@ -52,11 +43,6 @@
       </li>
     {/each}
   </ul>
-  {#if $workflowStore.currentWorkflow}
-    <button class="new-workflow-button hoverable" on:click={saveWorkflow}>
-      Save Workflow
-    </button>
-  {/if}
 </section>
 
 <style>