diff --git a/packages/file-handling/src/dbp-file-handling-clipboard.js b/packages/file-handling/src/dbp-file-handling-clipboard.js
index 4e21fd65d25a2bc64d53c82b0dadbecc4144c67f..709f8229d0e11ba3891d008a666ab891900956be 100644
--- a/packages/file-handling/src/dbp-file-handling-clipboard.js
+++ b/packages/file-handling/src/dbp-file-handling-clipboard.js
@@ -362,7 +362,8 @@ export class FileHandlingClipboard extends ScopedElementsMixin(DBPLitElement) {
      * Open Filesink for multiple files
      */
     async openClipboardFileSink() {
-        this._("#file-sink-clipboard").files = this.clipboardFiles.files;
+        this._("#file-sink-clipboard").files = Object.create(this.clipboardFiles.files);
+        console.log("------ this.clipboardFiles.files;", this.clipboardFiles.files);
         this._("#file-sink-clipboard").openDialog();
     }
 
diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js
index 198ddcce6e3f43d0633b83c4ee0b1952ff7863bb..7a0c5527f326896ec3292534672d95c1d43ca618 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -324,9 +324,13 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
      * @param path
      */
     loadDirectory(path) {
-        if ( typeof this.directoryPath === 'undefined' ) {
+        if ( typeof this.directoryPath === 'undefined' || this.directoryPath === undefined) {
            this.directoryPath = '';
         }
+        if(path === undefined) {
+            path = '';
+        }
+
         console.log("load nextcloud directory", path);
         this.selectAllButton = true;
         this.loading = true;
@@ -1150,6 +1154,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
             #replace-modal-box .modal-content label {
                 display: block;
                 width: 100%;
+                text-align: left;
             }
             
             #replace-modal-box #replace-filename {
@@ -1279,6 +1284,19 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                 max-width: 130px;
             }
             
+            #replace-modal-box .modal-header{
+                padding: 0px;
+            }
+            
+            #replace-modal-content{
+                padding: 0px;
+                align-items: baseline;
+            }
+            
+            #replace-modal-box .modal-header h2{
+                text-align: left;
+            }
+            
           
          
             
@@ -1498,14 +1516,14 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                 <div class="modal-overlay" tabindex="-2" data-micromodal-close>
                     <div class="modal-container" id="replace-modal-box" role="dialog" aria-modal="true" aria-labelledby="replace-modal-title" >
                         <header class="modal-header">
+                            <button title="${i18n.t('file-sink.modal-close')}" class="modal-close"  aria-label="Close modal" @click="${() => {this.closeDialog();}}">
+                                <dbp-icon title="${i18n.t('file-sink.modal-close')}" name="close" class="close-icon"></dbp-icon>
+                            </button>
                             <h2 id="replace-modal-title">
                                 ${i18n.t('nextcloud-file-picker.replace-title-1')}
                                 <span style="word-break: break-all;">${this.replaceFilename}</span>
                                 ${i18n.t('nextcloud-file-picker.replace-title-2')}.
                             </h2>
-                            <button title="${i18n.t('file-sink.modal-close')}" class="modal-close"  aria-label="Close modal" @click="${() => {this.closeDialog();}}">
-                                <dbp-icon title="${i18n.t('file-sink.modal-close')}" name="close" class="close-icon"></dbp-icon>
-                            </button> 
                         </header>
                         <main class="modal-content" id="replace-modal-content">
                             <h3>
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index 51244a791bffdc2ab9398364d91cb5905a220df6..9a9399f6877248524a74b3319252358deb367455 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -164,6 +164,8 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
         let that = this;
         const element = that._('#nextcloud-file-picker');
         await element.uploadFiles(that.files, directory);
+        console.log("--------- f", that.files);
+        console.log("--------- d", directory);
     }
 
     finishedFileUpload(event) {
@@ -178,6 +180,8 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
                 "timeout": 5,
             });
         }
+        console.log("--------- finishedFileUpload", this.files);
+
     }
 
     sendDestination() {
@@ -189,6 +193,8 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
             data = {"target": this.activeTarget};
         }
         this.sendSetPropertyEvent('initial-file-handling-state', data);
+        console.log("--------- finishedFileUpload", this.files);
+
     }