diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index b4b2ed5456a0588e1748346de4d9326283d7dd4e..a3074a75450c7625afb8748d3c7f070f5c0e18f6 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -251,6 +251,7 @@ export class FileSink extends ScopedElementsMixin(DbpFileHandlingLitElement) {
             const filePicker = this._('#clipboard-file-picker');
             if (filePicker && filePicker.tabulatorTable) {
                 filePicker.tabulatorTable.deselectRow();
+                filePicker.numberOfSelectedFiles = 0;
                 if (filePicker._('#select_all')) {
                     filePicker._("#select_all").checked = false;
                 }
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index c0a8a7ba995c6dbef43eee69a93f3b888a9bd6cc..dbac845f91847fb3b5ef6e7fc38ab24816d8da1d 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -443,6 +443,7 @@ export class FileSource extends ScopedElementsMixin(DbpFileHandlingLitElement) {
         if (this.enabledTargets.includes('clipboard')) {
             const filePicker = this._('#clipboard-file-picker');
             if (filePicker && filePicker.tabulatorTable) {
+                filePicker.numberOfSelectedFiles = 0;
                 filePicker.tabulatorTable.deselectRow();
                 if (filePicker._('#select_all')) {
                     filePicker._("#select_all").checked = false;
diff --git a/packages/file-handling/src/nextcloud-file-picker.js b/packages/file-handling/src/nextcloud-file-picker.js
index 1e9e2ab2e29d292389a75e89c8f43383f417ef5b..b95a30d0c9fe5b722e770b68f5f76d1b545af91d 100644
--- a/packages/file-handling/src/nextcloud-file-picker.js
+++ b/packages/file-handling/src/nextcloud-file-picker.js
@@ -258,7 +258,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                     } else {
                         this.folderIsSelected = i18n.t('nextcloud-file-picker.load-in-folder');
                     }
-                    if (this.tabulatorTable && this.tabulatorTable.getSelectedRows().filter(row => row.getData().type != 'directory' && this.checkFileType(row.getData(), this.allowedMimeTypes)).length > 0) {
+                    if (!this.directoriesOnly && this.tabulatorTable && this.tabulatorTable.getSelectedRows().filter(row => row.getData().type != 'directory' && this.checkFileType(row.getData(), this.allowedMimeTypes)).length > 0) {
                         this.selectBtnDisabled = false;
                     } else {
                         this.selectBtnDisabled = true;