diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index b83abf79b..966da8cd3 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -62,11 +62,8 @@ $('.folderselect').click(function(ev) {
 		$previewwidth = 40;
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
 
-		$content = '';
-		$content .= "   <ul id=\"main-menu-dropfolderlist\" class=\"nav pull-right\">\n";
-		$content .= "    <li class=\"dropdown add-dropfolderlist-area\">\n";
-		$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." <i class=\"icon-caret-down\"></i></a>\n";
-		$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+		$c = 0; // count files
+		$filecontent = '';
 		$dir = $dropfolderdir.'/'.$user->getLogin();
 		/* Check if we are still looking in the configured directory and
 		 * not somewhere else, e.g. if the login was '../test'
@@ -79,23 +76,32 @@ $('.folderselect').click(function(ev) {
 				while (false !== ($entry = $d->read())) {
 					if($entry != '..' && $entry != '.') {
 						if($showfolders == 0 && !is_dir($dir.'/'.$entry)) {
+							$c++;
 							$mimetype = finfo_file($finfo, $dir.'/'.$entry);
 							$previewer->createRawPreview($dir.'/'.$entry, 'dropfolder/', $mimetype);
-							$content .= "<li><a".($folderid ? " href=\"../out/out.AddDocument.php?folderid=".$folderid."&dropfolderfileform1=".urldecode($entry)."\"" : "").">";
+							$filecontent .= "<li><a".($folderid ? " href=\"../out/out.AddDocument.php?folderid=".$folderid."&dropfolderfileform1=".urldecode($entry)."\"" : "").">";
 							if($previewer->hasRawPreview($dir.'/'.$entry, 'dropfolder/')) {
-								$content .= "<div style=\"float: left; display:inline; width:40px; max-height:40px;overflow:hidden;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
+								$filecontent .= "<div style=\"float: left; display:inline; width:40px; max-height:40px;overflow:hidden;\"><img filename=\"".$entry."\" width=\"".$previewwidth."\" src=\"../op/op.DropFolderPreview.php?filename=".$entry."&width=".$previewwidth."\" title=\"".htmlspecialchars($mimetype)."\"></div>";
 							}
-							$content .= "<div style=\"margin-left:10px; margin-right: 40px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div></a></li>\n";
+							$filecontent .= "<div style=\"margin-left:10px; margin-right: 40px; display:inline-block;\">".$entry."<br /><span style=\"font-size: 85%;\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry)).", ".date('Y-m-d H:i:s', filectime($dir.'/'.$entry))."</span></div></a></li>\n";
 						} elseif($showfolders && is_dir($dir.'/'.$entry)) {
-							$content .= "<li><a _href=\"\">".$entry."</a></li>";
+							$filecontent .= "<li><a _href=\"\">".$entry."</a></li>";
 						}
 					}
 				}
 			}
 		}
-		$content .= "     </ul>\n";
-		$content .= "    </li>\n";
-		$content .= "   </ul>\n";
+		$content = '';
+		if($c) {
+			$content .= "   <ul id=\"main-menu-dropfolderlist\" class=\"nav pull-right\">\n";
+			$content .= "    <li class=\"dropdown add-dropfolderlist-area\">\n";
+			$content .= "     <a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" class=\"add-dropfolderlist-area\">".getMLText('menu_dropfolder')." (".$c.") <i class=\"icon-caret-down\"></i></a>\n";
+			$content .= "     <ul class=\"dropdown-menu\" role=\"menu\">\n";
+			$content .= $filecontent;
+			$content .= "     </ul>\n";
+			$content .= "    </li>\n";
+			$content .= "   </ul>\n";
+		}
 		echo $content;
 	} /* }}} */