diff --git a/packages/file-handling/src/clipboard.js b/packages/file-handling/src/clipboard.js
index cafdafe0e6954564a649ae5df29ddb20beed5ae2..e68b84f1fc471fe047522295c9ab9514ddecb9e5 100644
--- a/packages/file-handling/src/clipboard.js
+++ b/packages/file-handling/src/clipboard.js
@@ -501,6 +501,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
      * @return html
      */
     getAdditionalButtons() {
+        let buttonsAreDisabled = this.clipboardFiles.files.length === 0 ? true : this.clipboardSelectBtnDisabled;
         return html`
             <div class="flex-container additional-button-container">
                         <div class="btn-flex-container-mobile">
@@ -510,13 +511,13 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
                             </button>
                             <button @click="${() => { this.clearClipboard(); }}"
                                     class="button" title="${(this.numberOfSelectedFiles > 0) ? i18n.t('clipboard.remove-count', {count: this.numberOfSelectedFiles}) : i18n.t('clipboard.remove-all')}"
-                                    ?disabled="${this.clipboardFiles.files.length === 0}">
+                                    ?disabled="${buttonsAreDisabled}">
                                 ${(this.numberOfSelectedFiles > 0) ? i18n.t('clipboard.remove-count-btn', {count: this.numberOfSelectedFiles}) : i18n.t('clipboard.remove-all-btn')}
                             </button>
                         </div>
                         <div class="btn-flex-container-mobile">
                             <button @click="${() => { this.openFileSink(); }}"
-                                    ?disabled="${this.clipboardFiles.files.length === 0}"
+                                    ?disabled="${buttonsAreDisabled}"
                                     class="button" title="${(this.numberOfSelectedFiles > 0) ? i18n.t('clipboard.save-count', {count: this.numberOfSelectedFiles}) : i18n.t('clipboard.save-all')}">
                                 ${(this.numberOfSelectedFiles > 0) ? i18n.t('clipboard.save-count-btn', {count: this.numberOfSelectedFiles}) : i18n.t('clipboard.save-all-btn')}
                             </button>
diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js
index 23506dd408573ccfb2b70f24c2fc86dbc7b906f5..97fecc4abc134828d0bac8e9526fcbbdd25cb969 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -346,6 +346,8 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
         this.statusText = i18n.t('nextcloud-file-picker.loadpath-nextcloud-file-picker', {name: this.nextcloudName});
         this.lastDirectoryPath = this.directoryPath;
         this.directoryPath = path;
+        if (this._("#select_all"))
+            this._("#select_all").checked = false;
 
         // see https://github.com/perry-mitchell/webdav-client#getdirectorycontents
         if (this.webDavClient === null) {
diff --git a/packages/file-handling/src/i18n/de/translation.json b/packages/file-handling/src/i18n/de/translation.json
index e9dfc4f3b610aa7741c621e66c281ae2656f042a..ee20bbccc760c9497e2130721f36ddae93c54df5 100644
--- a/packages/file-handling/src/i18n/de/translation.json
+++ b/packages/file-handling/src/i18n/de/translation.json
@@ -90,13 +90,13 @@
     "add-files": "Dateien der Zwischenablage hinzufügen",
     "add-files-btn": "Dateien hinzufügen",
     "remove-all": "Alle Dateien aus der Zwischenablage entfernen",
-    "remove-all-btn": "Alle entfernen",
+    "remove-all-btn": "Dateien entfernen",
     "remove-count": "Eine Datei aus der Zwischenablage entfernen",
     "remove-count_plural": "{{count}} Dateien aus der Zwischenablage entfernen",
     "remove-count-btn": "Datei entfernen",
     "remove-count-btn_plural": "{{count}} Dateien entfernen",
     "save-all": "Alle Dateien aus der Zwischenablage sichern",
-    "save-all-btn": "Alle sichern",
+    "save-all-btn": "Dateien sichern",
     "save-count-btn": "Datei sichern",
     "save-count-btn_plural": "{{count}} Dateien sichern",
     "save-count": "Eine Datei aus der Zwischenablage sichern",