diff --git a/src/app/services/content-management.service.ts b/src/app/services/content-management.service.ts
index 31c02520c..076fc6f00 100644
--- a/src/app/services/content-management.service.ts
+++ b/src/app/services/content-management.service.ts
@@ -236,6 +236,13 @@ export class ContentManagementService {
       this.store.dispatch(new SnackbarErrorAction(message));
     });
 
+    // todo: add focus in ADF component
+    dialogInstance
+      .afterOpened()
+      .subscribe(() =>
+        (<HTMLElement>document.querySelector('#adf-folder-name-input')).focus()
+      );
+
     dialogInstance.afterClosed().subscribe(node => {
       if (node) {
         this.folderCreated.next(node);
@@ -259,6 +266,13 @@ export class ContentManagementService {
       this.store.dispatch(new SnackbarErrorAction(message));
     });
 
+    // todo: add focus in ADF component
+    dialog
+      .afterOpened()
+      .subscribe(() =>
+        (<HTMLElement>document.querySelector('#adf-folder-name-input')).focus()
+      );
+
     dialog.afterClosed().subscribe((node: MinimalNodeEntryEntity) => {
       if (node) {
         this.folderEdited.next(node);