diff --git a/src/app/modal.component.ts b/src/app/modal.component.ts
index 5c8ae02d44..aef1f4f7ea 100644
--- a/src/app/modal.component.ts
+++ b/src/app/modal.component.ts
@@ -39,7 +39,7 @@ export class ModalComponent extends BaseModalComponent {
             });
             this.el.on('shown.bs.modal', () => {
                 this.onShown.emit();
-                this.el.find('input[appAutoFocus]').focus();
+                this.el.find('*[appAutoFocus]').focus();
             });
             this.el.on('hide.bs.modal', () => {
                 this.onClose.emit();
diff --git a/src/app/vault/bulk-delete.component.html b/src/app/vault/bulk-delete.component.html
index a09baf30c3..de082860c9 100644
--- a/src/app/vault/bulk-delete.component.html
+++ b/src/app/vault/bulk-delete.component.html
@@ -13,7 +13,7 @@
                 {{'deleteSelectedItemsDesc' | i18n: cipherIds.length}}
             </div>
             <div class="modal-footer">
-                <button appBlurClick type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
+                <button appBlurClick appAutoFocus type="submit" class="btn btn-danger btn-submit" [disabled]="form.loading">
                     <i class="fa fa-spinner fa-spin"></i>
                     <span>{{'delete' | i18n}}</span>
                 </button>