diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 2f82429c5..601182e64 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -137,10 +137,11 @@ $(document).ready(function() {
 	});
 });
 <?php
-			$this->printKeywordChooserJs("form1");
-			if($dropfolderdir) {
-				$this->printDropFolderChooserJs("form1");
-			}
+		$this->printKeywordChooserJs("form1");
+		if($dropfolderdir) {
+			$this->printDropFolderChooserJs("form1");
+		}
+		$this->printFileChooserJs();
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -305,7 +306,7 @@ $(document).ready(function() {
 		);
 		$this->formField(
 			getMLText("local_file"),
-			$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooser('userfile[]', false).($enablemultiupload ? '<a class="" id="new-file"><?php printMLtext("add_multiple_files") ?></a>' : '')
+			$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', false).($enablemultiupload ? '<a class="" id="new-file"><?php printMLtext("add_multiple_files") ?></a>' : '')
 		);
 		if($dropfolderdir) {
 			$this->formField(
diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php
index ce06e8baa..8797bdbf4 100644
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@@ -38,6 +38,8 @@ class SeedDMS_View_AddFile extends SeedDMS_Bootstrap_Style {
 		header('Content-Type: application/javascript');
 		if($enablelargefileupload)
 			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize);
+
+		$this->printFileChooserJs();
 ?>
 
 $(document).ready( function() {
@@ -155,7 +157,7 @@ $(document).ready( function() {
 <?php
 		$this->formField(
 			getMLText("local_file"),
-			($enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooser('userfile[]', false))
+			($enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', false))
 		);
 		$options = array();
 		$options[] = array("", getMLText('document'));
diff --git a/views/bootstrap/class.ApproveDocument.php b/views/bootstrap/class.ApproveDocument.php
index f335dbfab..da2588747 100644
--- a/views/bootstrap/class.ApproveDocument.php
+++ b/views/bootstrap/class.ApproveDocument.php
@@ -85,6 +85,8 @@ $(document).ready(function() {
 	});
 });
 <?php
+
+		$this->printFileChooserJs();
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -143,7 +145,7 @@ $(document).ready(function() {
 		);
 		$this->formField(
 			getMLText("approval_file"),
-			$this->getFileChooser('approvalfile', false)
+			$this->getFileChooserHtml('approvalfile', false)
 		);
 		$options = array();
 		if($approvalStatus['status'] != 1)
diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php
index 4e19c433a..241386089 100644
--- a/views/bootstrap/class.EditUserData.php
+++ b/views/bootstrap/class.EditUserData.php
@@ -79,6 +79,8 @@ $(document).ready( function() {
 	});
 });
 <?php
+
+		$this->printFileChooserJs();
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -170,7 +172,7 @@ $(document).ready( function() {
 			);
 			$this->formField(
 				getMLText("new_user_image"),
-				$this->getFileChooser('userfile', false, "image/jpeg")
+				$this->getFileChooserHtml('userfile', false, "image/jpeg")
 			);
 		}
 		if ($enablelanguageselector){	
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index 6580d74c2..fffc882ea 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -61,6 +61,8 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 			});
 		});
 <?php
+
+		$this->printFileChooserJs();
 	} /* }}} */
 
 	function info() { /* {{{ */
@@ -150,7 +152,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 <?php
 			$this->formField(
 				getMLText("extension_archive"),
-				$this->getFileChooser('userfile', false)
+				$this->getFileChooserHtml('userfile', false)
 			);
 			$this->formSubmit("<i class=\"icon-upload\"></i> ".getMLText('import_extension'));
 ?>
diff --git a/views/bootstrap/class.ReviewDocument.php b/views/bootstrap/class.ReviewDocument.php
index 122a36bea..ebf71f670 100644
--- a/views/bootstrap/class.ReviewDocument.php
+++ b/views/bootstrap/class.ReviewDocument.php
@@ -85,6 +85,8 @@ $(document).ready(function() {
 	});
 });
 <?php
+
+		$this->printFileChooserJs();
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -141,7 +143,7 @@ $(document).ready(function() {
 		);
 		$this->formField(
 			getMLText("review_file"),
-			$this->getFileChooser('review_file', false)
+			$this->getFileChooserHtml('review_file', false)
 		);
 		$options = array();
 		if($reviewStatus['status'] != 1)
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index ee94d8c6b..80e5366dc 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -44,6 +44,7 @@ class SeedDMS_View_UpdateDocument extends SeedDMS_Bootstrap_Style {
 		$this->printCheckboxPresetButtonJs();
 		if($enablelargefileupload)
 			$this->printFineUploaderJs('../op/op.UploadChunks.php', $partitionsize, $maxuploadsize, false);
+		$this->printFileChooserJs();
 ?>
 $(document).ready( function() {
 	jQuery.validator.addMethod("alternatives", function(value, element, params) {
@@ -221,7 +222,7 @@ console.log(element);
 <?php
 		$this->formField(
 			getMLText("local_file"),
-			$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooser('userfile', false)
+			$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile', false)
 		);
 		if($dropfolderdir) {
 			$this->formField(
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 49761f06b..3f45563ae 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -78,6 +78,8 @@ $(document).ready( function() {
 	});
 });
 <?php
+
+		$this->printFileChooserJs();
 	} /* }}} */
 
 	function info() { /* {{{ */
@@ -379,12 +381,12 @@ $(document).ready( function() {
 				);
 				$this->formField(
 					getMLText("new_user_image"),
-					$this->getFileChooser('userfile', false, "image/jpeg")
+					$this->getFileChooserHtml('userfile', false, "image/jpeg")
 				);
 			} else {
 				$this->formField(
 					getMLText("user_image"),
-					$this->getFileChooser('userfile', false, "image/jpeg")
+					$this->getFileChooserHtml('userfile', false, "image/jpeg")
 				);
 			}
 		}