diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js
index 6b3a8fd694b223ddd05f42f5781ca12799c57a66..24a7567e004e2f3554f5627173ca46b95dbf1725 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -859,8 +859,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
      *
      */
     selectAll() {
-        this.selectAllButton = false;
         this.tabulatorTable.selectRow(this.tabulatorTable.getRows().filter(row => row.getData().type != 'directory' && this.checkFileType(row.getData(), this.allowedMimeTypes)));
+        if (this.tabulatorTable.getSelectedRows().length > 0) {
+            this.selectAllButton = false;
+        }
     }
 
     /**
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index 636b3f839ae8ae75ed51245715ae2bd8028a1601..f6cdbd2fb53728b7945672d21df8d94cae51f1ea 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -155,6 +155,7 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) {
         console.log("openDialog");
         this.loadWebdavDirectory();
         MicroModal.show(this._('#modal-picker'), {
+            disableScroll: true,
             onClose: modal => { this.isDialogOpen = false; },
             closeTrigger: 'data-custom-close',
         });
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index c6d1b50d32224dbd52c933d2910c3e50cca381a4..66852397f7a2971f535fc5c290ba0d1e3cad288f 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -321,6 +321,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
         console.log("openDialog");
         this.loadWebdavDirectory();
         MicroModal.show(this._('#modal-picker'), {
+            disableScroll: true,
             onClose: modal => { this.isDialogOpen = false;
                 this._('#nextcloud-file-picker').selectAllButton = true;}
         });