diff --git a/src/app/modal.component.ts b/src/app/modal.component.ts
index 51d040ad0a..5c8ae02d44 100644
--- a/src/app/modal.component.ts
+++ b/src/app/modal.component.ts
@@ -39,6 +39,7 @@ export class ModalComponent extends BaseModalComponent {
             });
             this.el.on('shown.bs.modal', () => {
                 this.onShown.emit();
+                this.el.find('input[appAutoFocus]').focus();
             });
             this.el.on('hide.bs.modal', () => {
                 this.onClose.emit();