diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 0a9f1e4ac..0dca01507 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1232,9 +1232,9 @@ function folderSelected<?php echo $formName ?>(id, name) {
 	} /* }}} */
 
 	function getFolderChooserHtml($form, $accessMode, $exclude = -1, $default = false, $formname = '') { /* {{{ */
-		$formid = "targetid".$form;
 		if(!$formname)
 			$formname = "targetid";
+		$formid = $formname.$form;
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
@@ -1263,17 +1263,20 @@ function folderSelected<?php echo $formName ?>(id, name) {
 		echo self::getFolderChooserHtml($form, $accessMode, $exclude, $default, $formname);
 	} /* }}} */
 
-	function printFolderChooserJs($form) { /* {{{ */
+	function printFolderChooserJs($form, $formname='') { /* {{{ */
+		if(!$formname)
+			$formname = "targetid";
+		$formid = $formname.$form;
 ?>
 function folderSelected<?php echo $form ?>(id, name) {
-	$('#targetid<?php echo $form ?>').val(id);
+	$('#<?php echo $formid ?>').val(id);
 	$('#choosefoldersearch<?php echo $form ?>').val(name);
 	$('#folderChooser<?php echo $form ?>').modal('hide');
 }
 $(document).ready(function() {
 	$('#clearfolder<?php print $form ?>').click(function(ev) {
 		$('#choosefoldersearch<?php echo $form ?>').val('');
-		$('#targetid<?php echo $form ?>').val('');
+		$('#<?php echo $formid ?>').val('');
 	});
 });
 <?php
@@ -1284,7 +1287,7 @@ $(document).ready(function() {
 ?>
 		<script language="JavaScript">
 <?php
-		$this->printFolderChooserJs($form);
+		$this->printFolderChooserJs($form, $formname);
 ?>
 		</script>
 <?php
@@ -1825,7 +1828,10 @@ $(function() {
 		echo json_encode($tree);
 	} /* }}} */
 
-	function printTreeNavigation($folderid, $showtree){ /* {{{ */
+	/**
+	 * Deprecated!
+	 */
+	function __printTreeNavigation($folderid, $showtree){ /* {{{ */
 		if ($showtree==1){
 			$this->contentHeading("<a href=\"../out/out.ViewFolder.php?folderid=". $folderid."&showtree=0\"><i class=\"icon-minus-sign\"></i></a>", true);
 			$this->contentContainerStart();
diff --git a/views/bootstrap/class.FolderChooser.php b/views/bootstrap/class.FolderChooser.php
index 33f099022..88d9bc0c2 100644
--- a/views/bootstrap/class.FolderChooser.php
+++ b/views/bootstrap/class.FolderChooser.php
@@ -46,7 +46,7 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style {
 		$orderby = $this->params['orderby'];
 
 		header('Content-Type: application/javascript');
-		$this->printNewTreeNavigationJs($rootfolderid, $mode, 0, $form, '', $orderby);
+		$this->printNewTreeNavigationJs($rootfolderid, $mode, 0, $form, 0, $orderby);
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -59,14 +59,8 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style {
 		$rootfolderid = $this->params['rootfolderid'];
 
 //		$this->htmlStartPage(getMLText("choose_target_folder"));
-//		$this->contentContainerStart();
-if(1) {
 		$this->printNewTreeNavigationHtml($rootfolderid, $mode, 0, $form, 0, $orderby);
 		echo '<script src="../out/out.FolderChooser.php?action=js&'.$_SERVER['QUERY_STRING'].'"></script>'."\n";
-} else {
-			$this->printNewTreeNavigation($rootfolderid, $mode, 0, $form);
-}
-//		$this->contentContainerEnd();
 //		$this->htmlEndPage(true);
 	} /* }}} */
 }