diff --git a/lib/core/viewer/components/viewer.component.html b/lib/core/viewer/components/viewer.component.html
index d5dd9f7963..f7ad993387 100644
--- a/lib/core/viewer/components/viewer.component.html
+++ b/lib/core/viewer/components/viewer.component.html
@@ -3,7 +3,7 @@
      [class.adf-viewer-overlay-container]="overlayMode"
      [class.adf-viewer-inline-container]="!overlayMode">
 
-    <div class="adf-viewer-content" fxLayout="column">
+    <div class="adf-viewer-content" fxLayout="column" [cdkTrapFocus]="overlayMode" cdkTrapFocusAutoCapture>
         <ng-content select="adf-viewer-toolbar"></ng-content>
         <ng-container *ngIf="showToolbar && !toolbar">
             <adf-toolbar color="default" id="adf-viewer-toolbar" class="adf-viewer-toolbar">
diff --git a/lib/core/viewer/viewer.module.ts b/lib/core/viewer/viewer.module.ts
index 56d410f6d8..4a70bb4ef3 100644
--- a/lib/core/viewer/viewer.module.ts
+++ b/lib/core/viewer/viewer.module.ts
@@ -42,6 +42,7 @@ import { ViewerComponent } from './components/viewer.component';
 import { ViewerExtensionDirective } from './directives/viewer-extension.directive';
 import { ViewerToolbarActionsComponent } from './components/viewer-toolbar-actions.component';
 import { DirectiveModule } from '../directives/directive.module';
+import { A11yModule } from '@angular/cdk/a11y';
 
 @NgModule({
     imports: [
@@ -54,7 +55,8 @@ import { DirectiveModule } from '../directives/directive.module';
         ToolbarModule,
         PipeModule,
         FlexLayoutModule,
-        DirectiveModule
+        DirectiveModule,
+        A11yModule
     ],
     declarations: [
         PdfPasswordDialogComponent,