diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index ff2ea8341..2526b0db7 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -367,10 +367,10 @@ function typeahead() { /* {{{ */
 			foreach ($entries as $entry) {
 				if($entry->isType('document')) {
 //					$recs[] = 'D'.$entry->getName();
-					$recs[] = array('type'=>'D', 'id'=>$entry->getId(), 'name'=>$entry->getName(), 'path'=>$entry->getParent()->getFolderPathPlain(true, '/'));
+					$recs[] = array('type'=>'D', 'id'=>$entry->getId(), 'name'=>htmlspecialchars($entry->getName()), 'path'=>htmlspecialchars($entry->getParent()->getFolderPathPlain(true, '/')));
 				} elseif($entry->isType('folder')) {
 //					$recs[] = 'F'.$entry->getName();
-					$recs[] = array('type'=>'F', 'id'=>$entry->getId(), 'name'=>$entry->getName(), 'path'=>$entry->getParent()->getFolderPathPlain(true, '/'));
+					$recs[] = array('type'=>'F', 'id'=>$entry->getId(), 'name'=>htmlspecialchars($entry->getName()), 'path'=>htmlspecialchars($entry->getParent()->getFolderPathPlain(true, '/')));
 				}
 			}
 		}