diff --git a/packages/web/src/javascripts/Components/FileDragNDropProvider/FileDragNDropProvider.tsx b/packages/web/src/javascripts/Components/FileDragNDropProvider/FileDragNDropProvider.tsx
index f669e7243..470406e56 100644
--- a/packages/web/src/javascripts/Components/FileDragNDropProvider/FileDragNDropProvider.tsx
+++ b/packages/web/src/javascripts/Components/FileDragNDropProvider/FileDragNDropProvider.tsx
@@ -166,6 +166,12 @@ const FileDragNDropProvider = ({ application, children, featuresController, file
       event.preventDefault()
       event.stopPropagation()
 
+      let closestDragTarget: Element | null = null
+
+      if (event.target instanceof HTMLElement) {
+        closestDragTarget = event.target.closest('[data-file-drag-target]')
+      }
+
       resetState()
 
       if (!featuresController.hasFiles) {
@@ -189,12 +195,6 @@ const FileDragNDropProvider = ({ application, children, featuresController, file
             return
           }
 
-          let closestDragTarget: Element | null = null
-
-          if (event.target instanceof HTMLElement) {
-            closestDragTarget = event.target.closest('[data-file-drag-target]')
-          }
-
           if (closestDragTarget && dragTargets.current.has(closestDragTarget)) {
             dragTargets.current.get(closestDragTarget)?.callback(uploadedFiles)
           }
diff --git a/packages/web/src/javascripts/Components/NoteView/NoteViewFileDropTarget.tsx b/packages/web/src/javascripts/Components/NoteView/NoteViewFileDropTarget.tsx
index 45a6f7820..93c7f360a 100644
--- a/packages/web/src/javascripts/Components/NoteView/NoteViewFileDropTarget.tsx
+++ b/packages/web/src/javascripts/Components/NoteView/NoteViewFileDropTarget.tsx
@@ -18,9 +18,9 @@ const NoteViewFileDropTarget = ({ note, linkingController, noteViewElement }: Pr
     if (target) {
       addDragTarget(target, {
         tooltipText: 'Drop your files to upload and link them to the current note',
-        callback(files) {
+        callback: (files) => {
           files.forEach(async (uploadedFile) => {
-            await linkingController.linkItems(uploadedFile, note)
+            await linkingController.linkItems(note, uploadedFile)
           })
         },
       })