diff --git a/src/app/components/dialog/dialog.ts b/src/app/components/dialog/dialog.ts index 93918923200..ec7f6952f59 100755 --- a/src/app/components/dialog/dialog.ts +++ b/src/app/components/dialog/dialog.ts @@ -611,7 +611,7 @@ export class Dialog implements AfterContentInit, OnInit, OnDestroy { this.zone.runOutsideAngular(() => { setTimeout(() => focusableElement.focus(), 5); }); - } else if (this.footerViewChild) { + } else if (this.footerViewChild && focusParentElement !== this.footerViewChild.nativeElement) { // If the content section is empty try to focus on footer this.focus(this.footerViewChild.nativeElement); }