diff --git a/web/app/components/workflow/skill/hooks/use-file-drop.ts b/web/app/components/workflow/skill/hooks/use-file-drop.ts
index 511b39b050..d4d5e072ba 100644
--- a/web/app/components/workflow/skill/hooks/use-file-drop.ts
+++ b/web/app/components/workflow/skill/hooks/use-file-drop.ts
@@ -71,14 +71,16 @@ export function useFileDrop() {
       return
 
     try {
-      for (const file of files) {
-        await createFile.mutateAsync({
-          appId,
-          name: file.name,
-          file,
-          parentId: targetFolderId,
-        })
-      }
+      await Promise.all(
+        files.map(file =>
+          createFile.mutateAsync({
+            appId,
+            name: file.name,
+            file,
+            parentId: targetFolderId,
+          }),
+        ),
+      )
 
       Toast.notify({
         type: 'success',
diff --git a/web/app/components/workflow/skill/hooks/use-folder-file-drop.ts b/web/app/components/workflow/skill/hooks/use-folder-file-drop.ts
index fa0cc79d74..00a6a2f93a 100644
--- a/web/app/components/workflow/skill/hooks/use-folder-file-drop.ts
+++ b/web/app/components/workflow/skill/hooks/use-folder-file-drop.ts
@@ -62,7 +62,7 @@ export function useFolderFileDrop(node: NodeApi<TreeNodeData>): UseFolderFileDro
   }, [isFolder, scheduleAutoExpand])
 
   const handleFolderDragOver = useCallback((e: React.DragEvent) => {
-    if (!isFolder)
+    if (!isFolder || !isFileDrag(e))
       return
     handleDragOver(e, { folderId: node.data.id, isFolder: true })
   }, [handleDragOver, isFolder, node.data.id])