diff --git a/packages/file-handling/src/clipboard.js b/packages/file-handling/src/clipboard.js
index 9572f73a5f9b7f88faa02c225d1c3187d431c924..4db1aed72df53562b4e92a08537328cae97edc09 100644
--- a/packages/file-handling/src/clipboard.js
+++ b/packages/file-handling/src/clipboard.js
@@ -468,7 +468,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
     openFilesource() {
         const fileSource = this._("#file-source-clipboard");
         if (fileSource) {
-            this._("#file-source-clipboard").setAttribute("dialog-open", "");
+            this._("#file-source-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 55f82b0b2d810e6c6b8a8ee404527b030431c34b..f45838f86f26dbd511663b3e1a4fae722f6903d3 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -295,10 +295,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
             const authUrl = this.authUrl + "?target-origin=" + encodeURIComponent(window.location.href);
             this.loginWindow = window.open(authUrl, "Nextcloud Login",
                 "width=400,height=400,menubar=no,scrollbars=no,status=no,titlebar=no,toolbar=no");
-            console.log("open nextcloud filepicker, no webdavclient");
+            //console.log("open nextcloud filepicker, no webdavclient");
         } else {
             this.loadDirectory(this.directoryPath, this.webDavClient);
-            console.log("load in nextcloud webcomponent");
+            //console.log("load in nextcloud webcomponent");
         }
     }
 
@@ -476,6 +476,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                 this.dispatchEvent(event);
                 this.loading = false;
                 this.statusText = "";
+                this.numberOfSelectedFiles = 0;
             }).catch(error => {
                 console.error(error.message);
                 this.loading = false;
@@ -490,6 +491,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
      */
     sendDirectory(directory) {
         this.tabulatorTable.deselectRow();
+        this.numberOfSelectedFiles = 0;
         let path;
 
         if (!directory[0]) {
@@ -792,6 +794,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
     }
 
     closeDialog(e) {
+        this.numberOfSelectedFiles = 0;
         MicroModal.close(this._('#modal-picker'));
     }
 
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index f2a5d536662d33c073806c91ea5e65d4960896cf..adae346b932e3105128146e7ee739639f6602012 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -130,7 +130,7 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
                     }
                     break;
                 case "files":
-                    if (this.files.length !== 0 && !this.isDialogOpen) {
+                    if (this.files.length !== 0) {
                         this.openDialog();
                         if (this.enabledTargets.includes("clipboard")) {
                             const clipboardSink = this._("#clipboard-file-picker");
@@ -203,7 +203,6 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
     }
 
     openDialog() {
-        console.log("open sink");
         if (this.enabledTargets.includes('nextcloud')) {
             this.loadWebdavDirectory();
         }
@@ -227,13 +226,14 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
             }
             this.firstOpen = false;
         }
-    }
 
-    //TODO find open error!!
+        this.isDialogOpen = true;
+    }
 
     closeDialog(e) {
         this.sendDestination();
         MicroModal.close(this._('#modal-picker'));
+        this.isDialogOpen = false;
     }
 
     getClipboardHtml() {
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index 87ea187c4ffb40e32dcbfc67ac222112b12a2dca..e329114a60c15653b5e8ed5cfc576dd9359f10cb 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -369,7 +369,6 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
     }
 
     openDialog() {
-        console.log("open source");
 
         if (this.enabledTargets.includes('nextcloud')) {
             this.loadWebdavDirectory();
@@ -413,12 +412,6 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
 
     closeDialog() {
         this.sendSource();
-        const filePicker = this._('#nextcloud-file-picker');
-
-        if (filePicker) {
-            filePicker.selectAllButton = true;
-        }
-
         MicroModal.close(this._('#modal-picker'));
     }