diff --git a/client/web/workflow/src/components/Export.vue b/client/web/workflow/src/components/Export.vue
index a1b77343c..54dc88c7f 100644
--- a/client/web/workflow/src/components/Export.vue
+++ b/client/web/workflow/src/components/Export.vue
@@ -68,7 +68,8 @@ export default {
 
       // Save file
       const blob = new Blob([JSON.stringify({ workflows }, null, 2)], { type: 'application/json' })
-      saveAs(blob, `${this.fileName}.json`)
+      const filename = this.fileName.replace(/[/\\?%*:|"<>]/g, '')
+      saveAs(blob, `${filename}.json`)
     },
   },
 }
diff --git a/client/web/workflow/src/components/WorkflowEditor.vue b/client/web/workflow/src/components/WorkflowEditor.vue
index 4f6786d2b..822814095 100644
--- a/client/web/workflow/src/components/WorkflowEditor.vue
+++ b/client/web/workflow/src/components/WorkflowEditor.vue
@@ -329,7 +329,7 @@
         <export
           data-test-id="button-export-workflow"
           :workflows="[workflow.workflowID]"
-          :file-name="workflow.handle"
+          :file-name="workflow.meta.name || workflow.handle"
           class="ml-1"
         />