diff --git a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html
index ecb907f324..dfcc3e7302 100644
--- a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html
+++ b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.html
@@ -7,7 +7,7 @@
     [nodeId]="nodeId"
     [versionId]="versionId"
     [allowNavigate]="navigateMultiple"
-    [allowRightSidebar]="false"
+    [allowRightSidebar]="true"
     [allowPrint]="false"
     [showRightSidebar]="true"
     [allowDownload]="false"
diff --git a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss
index 64beb08bcd..2007d40687 100644
--- a/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss
+++ b/projects/aca-content/viewer/src/lib/components/viewer/viewer.component.scss
@@ -20,6 +20,15 @@
     padding-left: 12px;
   }
 
+  // todo: remove this when viewer supports extensions
+  .adf-viewer-toolbar > * > button:last-child:not(.adf-right-close-button) {
+    display: none;
+  }
+
+  .adf-viewer-toolbar.adf-viewer-right-close-button > * > button:nth-last-child(3) {
+    display: none;
+  }
+
   .adf-alfresco-viewer.aca-right_side--hide .adf-viewer__sidebar__right {
     width: 0;
   }
diff --git a/projects/aca-testing-shared/src/components/viewer/viewer.ts b/projects/aca-testing-shared/src/components/viewer/viewer.ts
index 54d0467dda..0d04617c4f 100755
--- a/projects/aca-testing-shared/src/components/viewer/viewer.ts
+++ b/projects/aca-testing-shared/src/components/viewer/viewer.ts
@@ -103,7 +103,7 @@ export class Viewer extends Component {
   }
 
   async clickCloseButton(): Promise<void> {
-    const closeButton: ElementFinder = element(by.css('button[data-automation-id="adf-toolbar-back"]'));
+    const closeButton: ElementFinder = element(by.css('button.adf-viewer-close-button'));
     await BrowserActions.click(closeButton);
   }
 }