diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 4450f3d49..52710aca2 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -127,9 +127,17 @@
                 <li [ngbNavItem]="4" class="d-md-none">
                   <a ngbNavLink>Preview</a>
                   <ng-template ngbNavContent *ngIf="pdfPreview.offsetParent == undefined">
-                    <div class="pdf-viewer-container" *ngIf="getContentType() == 'application/pdf'">
-                      <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true"></pdf-viewer>
-                    </div>
+                    <ng-container *ngIf="getContentType() == 'application/pdf'">
+                        <div class="preview-sticky pdf-viewer-container" *ngIf="!useNativePdfViewer ; else nativePdfViewer">
+                            <pdf-viewer [src]="previewUrl" [original-size]="false" [show-borders]="true" [show-all]="true" [render-text-mode]="2"></pdf-viewer>
+                        </div>
+                        <ng-template #nativePdfViewer>
+                            <object [data]="previewUrl | safe" class="preview-sticky" width="100%"></object>
+                        </ng-template>
+                    </ng-container>
+                    <ng-container *ngIf="getContentType() == 'text/plain'">
+                        <object [data]="previewUrl | safe" type="text/plain" class="preview-sticky bg-white" width="100%"></object>
+                    </ng-container>
                   </ng-template>
                 </li>
             </ul>
@@ -154,6 +162,5 @@
         <ng-container *ngIf="getContentType() == 'text/plain'">
             <object [data]="previewUrl | safe" type="text/plain" class="preview-sticky bg-white" width="100%"></object>
         </ng-container>
-
     </div>
 </div>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index f03270547..4effb6179 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -75,8 +75,7 @@ export class DocumentDetailComponent implements OnInit, OnDestroy, DirtyComponen
   @ViewChild('nav') nav: NgbNav
   @ViewChild('pdfPreview') set pdfPreview(element) {
     // this gets called when compontent added or removed from DOM
-    if (element && element.nativeElement.offsetParent !== null) { // its visible
-
+    if (element && element.nativeElement.offsetParent !== null && this.nav?.activeId == 4) { // its visible
       setTimeout(()=> this.nav?.select(1));
     }
   }