diff --git a/packages/file-handling/src/i18n/de/translation.json b/packages/file-handling/src/i18n/de/translation.json
index 973ba0b8228ee92c6c9d53298349b54ca69cd6c4..b120b419840794134a19c9e265c4dabb576a35a3 100644
--- a/packages/file-handling/src/i18n/de/translation.json
+++ b/packages/file-handling/src/i18n/de/translation.json
@@ -48,7 +48,7 @@
         "no-favorites": "Es wurden keine Favoriten des entsprechenden Typs gefunden. Definieren Sie Dateien und Ordner in Ihrer {{name}} als Favoriten, um diese hier anzuzeigen.",
         "no-recent-files": "Es wurden keine entsprechenden Dateien und Ordner innerhalb der letzten 3 Monate gefunden.",
         "webdav-error": "Etwas ist schief gelaufen: {{error}}",
-        "add-folder-error": "Die Ressource \"{{folder}}\", ist bereits vorhanden.",
+        "add-folder-error": "Die Ressource \"{{folder}}\" ist bereits vorhanden.",
         "add-folder-error-empty": "Der Ordnername darf nicht leer sein.",
         "add-folder-success": "Der Ordner \"{{folder}}\" wurde erfolgreich erstellt.",
         "add-folder-open": "Neuer Ordner Dialog öffnen",
@@ -88,7 +88,7 @@
         "all-recent-files-link-text": "Alle neuesten Dateien",
         "new-folder-dialog-title": "Neuen Ordner erstellen",
         "new-folder-dialog-label": "Name eingeben:",
-        "new-folder-dialog-button-ok": "Übernehmen",
+        "new-folder-dialog-button-ok": "Erstellen",
         "new-folder-dialog-button-cancel": "Abbrechen",
         "new-folder-dialog-default-name": "Neuer Ordner"
     },
diff --git a/packages/file-handling/src/i18n/en/translation.json b/packages/file-handling/src/i18n/en/translation.json
index 08885cb17b41baba8efe39e98ab796cbbdf730ab..d2b001a4fe268d324a4781fdd5a1684bcf0eb4c5 100644
--- a/packages/file-handling/src/i18n/en/translation.json
+++ b/packages/file-handling/src/i18n/en/translation.json
@@ -89,7 +89,7 @@
         "all-recent-files-link-text": "All Recent Files",
         "new-folder-dialog-title": "Create a new folder",
         "new-folder-dialog-label": "Enter a name:",
-        "new-folder-dialog-button-ok": "Apply",
+        "new-folder-dialog-button-ok": "Create",
         "new-folder-dialog-button-cancel": "Cancel",
         "new-folder-dialog-default-name": "New folder"
     },
diff --git a/packages/file-handling/src/nextcloud-file-picker.js b/packages/file-handling/src/nextcloud-file-picker.js
index d4e42f2435e697f51848adcca8809a2cc2178fb1..e3e86afe3ff9cb39c39c261af18178042b83498a 100644
--- a/packages/file-handling/src/nextcloud-file-picker.js
+++ b/packages/file-handling/src/nextcloud-file-picker.js
@@ -2406,6 +2406,11 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
         if (menu && !menu.classList.contains('hidden')) this.toggleMoreMenu();
     }
 
+    _atChangeInput(event) {
+        if (this._("#new-folder-confirm-btn") )
+            this._("#new-folder-confirm-btn").disabled = this._('#tf-new-folder-dialog') && this._('#tf-new-folder-dialog').value === '';
+    }
+
     static get styles() {
         // language=css
         return css`
@@ -3574,7 +3579,8 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                                     class="input" 
                                     name="tf-new-folder-dialog" 
                                     id="tf-new-folder-dialog" 
-                                    value="${i18n.t('nextcloud-file-picker.new-folder-dialog-default-name')}" 
+                                    value="${i18n.t('nextcloud-file-picker.new-folder-dialog-default-name')}"
+                                    @input="${() => {this._atChangeInput();}}"
                                 />
                             </div>
                         </main>
@@ -3591,6 +3597,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                                 </button>
                                 <button
                                     class="button select-button is-primary"
+                                    id="new-folder-confirm-btn"
                                     @click="${() => {
                                         this.addNewFolder();
                                     }}">