diff --git a/packages/components-faraday/src/components/AuthorList/AuthorList.js b/packages/components-faraday/src/components/AuthorList/AuthorList.js
index 06f4f7bb27e3fb4350c902059019f360770690db..a41601af5d2a1aa09bb278657c4cd69dda37da09 100644
--- a/packages/components-faraday/src/components/AuthorList/AuthorList.js
+++ b/packages/components-faraday/src/components/AuthorList/AuthorList.js
@@ -61,7 +61,7 @@ const Authors = ({
       />
     ) : (
       <SortableList
-        beginDragProps={['index']}
+        beginDragProps={['index', 'lastName']}
         dragHandle={DragHandle}
         dropItem={dropItem}
         editedAuthor={editedAuthor}
diff --git a/packages/components-faraday/src/components/Files/FileSection.js b/packages/components-faraday/src/components/Files/FileSection.js
index 45fc23817d9f03f62f5fa9a37d4119e8a2913bce..b885046f2bb6c37c43569d7d419bf430edf1ce23 100644
--- a/packages/components-faraday/src/components/Files/FileSection.js
+++ b/packages/components-faraday/src/components/Files/FileSection.js
@@ -125,7 +125,6 @@ export default compose(
           files,
           setError,
           allowedFileExtensions,
-          ...pm
         },
         monitor,
       ) {
@@ -144,7 +143,6 @@ export default compose(
           setError('No more files can be added to this section.')
           return
         }
-
         if (toListId === fromListId) return
         changeList(fromListId, toListId, id)
       },
diff --git a/packages/components-faraday/src/components/Files/Files.js b/packages/components-faraday/src/components/Files/Files.js
index cdd8aa84fcfa51dfb85ac8f9045da36f751a5709..85b4f6417376aafa30ea57614df48624e95668a4 100644
--- a/packages/components-faraday/src/components/Files/Files.js
+++ b/packages/components-faraday/src/components/Files/Files.js
@@ -129,9 +129,17 @@ export default compose(
         windowReference.location = signedUrl
       })
     },
-    dropSortableFile: ({ files, setFiles, changeForm }) => () => {
-      setFiles(files)
-      changeForm('wizard', 'files', files)
+    dropSortableFile: ({ files, setFiles, changeForm }) => (
+      otherProps,
+      dragProps,
+    ) => {
+      // do something if the files is not changing list
+      const { listId: fromListId } = otherProps
+      const { listId: toListId } = dragProps
+      if (fromListId === toListId) {
+        setFiles(files)
+        changeForm('wizard', 'files', files)
+      }
     },
     changeList: ({ files, setFiles, changeForm }) => (
       fromListId,
@@ -149,7 +157,7 @@ export default compose(
         [fromListId]: fromFiles,
       }
       setFiles(newFiles)
-      changeForm('wizard', 'files', files)
+      changeForm('wizard', 'files', newFiles)
     },
     addFile: ({
       files,
diff --git a/packages/components-faraday/src/components/SortableList/SortableList.js b/packages/components-faraday/src/components/SortableList/SortableList.js
index ccbe292df8aa82e92a813650483ba8fb5b90c1d2..e454020635d88c8712efb97209a30001803a3227 100644
--- a/packages/components-faraday/src/components/SortableList/SortableList.js
+++ b/packages/components-faraday/src/components/SortableList/SortableList.js
@@ -41,12 +41,9 @@ const itemTarget = {
     }
     monitor.getItem().index = hoverIndex
   },
-  drop({ dropItem, index, listId: toListId, ...rest }, monitor) {
-    const { listId: fromListId } = monitor.getItem()
-    // TODO: fix it for authors too
-    if (fromListId === toListId) {
-      if (dropItem && typeof dropItem === 'function') dropItem(index)
-    }
+  drop({ dropItem, ...restProps }, monitor) {
+    if (dropItem && typeof dropItem === 'function')
+      dropItem(restProps, monitor.getItem())
   },
 }