diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index e9a48d19748ccb3887390e5be70d7a4aeea9652a..926d68c59a8082615674194b418ff382189671b4 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -197,8 +197,12 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
 
         const filePicker = this._('#nextcloud-file-picker');
 
-        if (filePicker && filePicker.webDavClient !== null) {
-            filePicker.loadDirectory(filePicker.directoryPath);
+        if (filePicker) {
+            filePicker.checkSessionStorage().then(contents => {
+                if (filePicker.webDavClient !== null) {
+                    filePicker.loadDirectory(filePicker.directoryPath);
+                }
+            });
         }
     }
 
@@ -206,6 +210,11 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
         if (this.enabledTargets.includes('nextcloud')) {
             this.loadWebdavDirectory();
         }
+        if (this.enabledTargets.includes('clipboard')) {
+            if (this._('#clipboard-file-picker')._("#select_all")) {
+                this._('#clipboard-file-picker')._("#select_all").checked = false;
+            }
+        }
         const filePicker = this._('#modal-picker');
         if (filePicker) {
             MicroModal.show(filePicker, {
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index 6f744abe37db4897ad55997d4e2437247423e633..32e6e62f631fc89dc61e14e19a613f184acd35c2 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -363,9 +363,14 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
     loadWebdavDirectory() {
         const filePicker = this._('#nextcloud-file-picker');
         // check if element is already in the dom (for example if "dialog-open" attribute is set)
-        if (filePicker && filePicker.webDavClient !== null) {
-            filePicker.loadDirectory(filePicker.directoryPath);
+        if (filePicker) {
+            filePicker.checkSessionStorage().then(contents => {
+                if (filePicker.webDavClient !== null) {
+                    filePicker.loadDirectory(filePicker.directoryPath);
+                }
+            });
         }
+
     }
 
     openDialog() {