diff --git a/lib/content-services/src/lib/dialogs/dialog.module.ts b/lib/content-services/src/lib/dialogs/dialog.module.ts
index 125281d3be..0c02adf5f0 100644
--- a/lib/content-services/src/lib/dialogs/dialog.module.ts
+++ b/lib/content-services/src/lib/dialogs/dialog.module.ts
@@ -27,6 +27,7 @@ import { ConfirmDialogComponent } from './confirm.dialog';
 import { MatDatetimepickerModule } from '@mat-datetimepicker/core';
 import { MatMomentDatetimeModule } from '@mat-datetimepicker/moment';
 import { LibraryDialogComponent } from './library/library.dialog';
+import { ContentDirectiveModule } from '../directives';
 
 @NgModule({
     imports: [
@@ -36,7 +37,8 @@ import { LibraryDialogComponent } from './library/library.dialog';
         FormsModule,
         ReactiveFormsModule,
         MatMomentDatetimeModule,
-        MatDatetimepickerModule
+        MatDatetimepickerModule,
+        ContentDirectiveModule
     ],
     declarations: [
         FolderDialogComponent,
diff --git a/lib/content-services/src/lib/dialogs/folder.dialog.html b/lib/content-services/src/lib/dialogs/folder.dialog.html
index 5fee151e99..137649a60a 100644
--- a/lib/content-services/src/lib/dialogs/folder.dialog.html
+++ b/lib/content-services/src/lib/dialogs/folder.dialog.html
@@ -12,6 +12,7 @@
                 matInput
                 required
                 [formControlName]="'name'"
+                adf-auto-focus
             />
 
             <mat-hint *ngIf="form.controls['name'].dirty">
diff --git a/lib/content-services/src/lib/dialogs/library/library.dialog.html b/lib/content-services/src/lib/dialogs/library/library.dialog.html
index b36b213c20..c8c205bee8 100644
--- a/lib/content-services/src/lib/dialogs/library/library.dialog.html
+++ b/lib/content-services/src/lib/dialogs/library/library.dialog.html
@@ -9,6 +9,7 @@
         matInput
         formControlName="title"
         autocomplete="off"
+        adf-auto-focus
       />
 
       <mat-hint *ngIf="libraryTitleExists">{{