diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 87b2b6087..80abf593a 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -255,6 +255,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 			echo "SeedDMSUpload.setMaxFileSizeMsg('".getMLText("uploading_maxsize")."');";
 		}
 ?>
+
 $(document).ready( function() {
 	$("#form1").validate({
 		ignore: [],
@@ -613,7 +614,7 @@ $(document).ready( function() {
 					$this->contentHeading(getMLText("preview"));
 ?>
 			<div style="width:100%; height: 0; position:relative; padding-top: 141%;">
-			<iframe src="<?= $settings->_httpRoot ?>pdfviewer/web/viewer.html?file=<?php echo urlencode($settings->_httpRoot.'op/op.ViewOnline.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="100%" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width:    100%; height: 100%"></iframe>
+			<iframe src="<?= $settings->_httpRoot ?>ext/pdfviewer/res/web/viewer.html?file=<?php echo urlencode($settings->_httpRoot.'op/op.ViewOnline.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="100%" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width: 100%; height: 100%"></iframe>
 			</div>
 <?php
 					break;
@@ -640,7 +641,7 @@ $(document).ready( function() {
 			if(is_string($txt))
 				echo $txt;
 
-			if($converttopdf) {
+			if($converttopdf && !$settings->extensionIsDisabled('pdfviewer')) {
 				$pdfpreviewer = new SeedDMS_Preview_PdfPreviewer($cachedir, $timeout, $xsendfile);
 				if($conversionmgr)
 					$pdfpreviewer->setConversionMgr($conversionmgr);
@@ -650,7 +651,7 @@ $(document).ready( function() {
 					$this->contentHeading(getMLText("preview_pdf"));
 ?>
 				<div style="width:100%; height: 0; position:relative; padding-top: 141%;">
-				<iframe src="<?= $settings->_httpRoot ?>pdfviewer/web/viewer.html?file=<?php echo urlencode($settings->_httpRoot.'op/op.PdfPreview.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="700px" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width:    100%; height: 100%"></iframe>
+				<iframe src="<?= $settings->_httpRoot ?>ext/pdfviewer/res/web/viewer.html?file=<?php echo urlencode($settings->_httpRoot.'op/op.PdfPreview.php?documentid='.$latestContent->getDocument()->getID().'&version='.$latestContent->getVersion()); ?>" _width="100%" _height="700px" style="position: absolute; top: 0; left: 0; bottom: 0; right: 0; width:    100%; height: 100%"></iframe>
 				</div>
 <?php
 				}