diff --git a/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchHelper.php b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchHelper.php
index 964688069..9ed2d0797 100644
--- a/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchHelper.php
+++ b/sources/application/UI/Base/Component/GlobalSearch/GlobalSearchHelper.php
@@ -112,7 +112,7 @@ class GlobalSearchHelper
 			// Add HTML label if missing
 			if(!isset($aHistoryEntries[$iIdx]['label_html']))
 			{
-				$aHistoryEntries[$iIdx]['label_html'] = utils::HtmlEntities($aHistoryEntries[$iIdx]['query']);
+				$aHistoryEntries[$iIdx]['label_html'] = utils::EscapeHtml($aHistoryEntries[$iIdx]['query']);
 			}
 
 			// Set absolute URL
diff --git a/sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php b/sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php
index 656b30249..950426c4f 100644
--- a/sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php
+++ b/sources/application/UI/Base/Component/QuickCreate/QuickCreateHelper.php
@@ -108,7 +108,7 @@ class QuickCreateHelper
 			// Add class label
 			if(!isset($aHistoryEntries[$iIdx]['label_html']))
 			{
-				$aHistoryEntries[$iIdx]['label_html'] = utils::HtmlEntities(MetaModel::GetName($sClass));
+				$aHistoryEntries[$iIdx]['label_html'] = utils::EscapeHtml(MetaModel::GetName($sClass));
 			}
 
 			// Add url