diff --git a/src/app/components/preview/preview.component.html b/src/app/components/preview/preview.component.html
index dfe66d3ce..0e3eb9a5e 100644
--- a/src/app/components/preview/preview.component.html
+++ b/src/app/components/preview/preview.component.html
@@ -3,7 +3,7 @@
     <adf-viewer
         [fileNodeId]="nodeId"
         [allowNavigate]="navigateMultiple"
-        [allowSidebar]="true"
+        [allowSidebar]="hasRightSidebar"
         [allowPrint] ="false"
         [allowDownload]="false"
         [allowFullScreen]="false"
@@ -12,13 +12,14 @@
         [overlayMode]="true"
         (showViewerChange)="onVisibilityChanged($event)"
         (navigateBefore)="onNavigateBefore()"
-        (navigateNext)="onNavigateNext()">
+        (navigateNext)="onNavigateNext()"
+        [ngClass]="hasRightSidebar ? 'hide-last-divider': ''">
 
         <adf-viewer-sidebar>
             <aca-info-drawer [node]="selection.file"></aca-info-drawer>
         </adf-viewer-sidebar>
 
-        <adf-viewer-open-with>
+        <adf-viewer-open-with *ngIf="openWith.length">
             <ng-container *ngFor="let action of openWith; trackBy: trackByActionId">
                 <aca-toolbar-action type="menu-item" [actionRef]="action"></aca-toolbar-action>
             </ng-container>
@@ -30,7 +31,7 @@
             </ng-container>
         </adf-viewer-toolbar-actions>
 
-        <adf-viewer-more-actions>
+        <adf-viewer-more-actions *ngIf="viewerToolbarMoreActions.length">
             <ng-container *ngFor="let action of viewerToolbarMoreActions; trackBy: trackByActionId">
                 <aca-toolbar-action type="menu-item" [actionRef]="action"></aca-toolbar-action>
             </ng-container>
diff --git a/src/app/components/preview/preview.component.scss b/src/app/components/preview/preview.component.scss
index 714aad589..74f765b7d 100644
--- a/src/app/components/preview/preview.component.scss
+++ b/src/app/components/preview/preview.component.scss
@@ -2,3 +2,17 @@
   width: 100%;
   height: 100%;
 }
+
+.hide-last-divider .adf-viewer-toolbar .mat-toolbar {
+  adf-toolbar-divider:last-of-type {
+    display: none;
+  }
+
+  > button:last-of-type {
+    right: 40px;
+  }
+}
+
+#adf-viewer-moreactions {
+  right: -40px;
+}
diff --git a/src/app/components/preview/preview.component.ts b/src/app/components/preview/preview.component.ts
index e0b326e26..9a433a5b0 100644
--- a/src/app/components/preview/preview.component.ts
+++ b/src/app/components/preview/preview.component.ts
@@ -74,6 +74,7 @@ export class PreviewComponent extends PageComponent
   navigateMultiple = false;
   openWith: Array<ContentActionRef> = [];
   contentExtensions: Array<ViewerExtensionRef> = [];
+  hasRightSidebar = true;
 
   constructor(
     private contentApi: ContentApiService,