diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php
index 1659a6ed2..a347966fa 100644
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -824,9 +824,9 @@ JS
 
 				$aJsonMap = array();
 				foreach ($aValues as $sKey => $aValue) {
-					$aElt = ['value' => $sKey, 'label' => utils::HtmlEntities($aValue['label']), 'obsolescence_flag' => $aValue['obsolescence_flag']];
+					$aElt = ['value' => $sKey, 'label' => utils::EscapeHtml($aValue['label']), 'obsolescence_flag' => $aValue['obsolescence_flag']];
 					if ($aValue['additional_field'] != '') {
-						$aElt['additional_field'] = utils::HtmlEntities($aValue['additional_field']);
+						$aElt['additional_field'] = utils::EscapeHtml($aValue['additional_field']);
 					}
 
 					if (array_key_exists('initials', $aValue)) {
diff --git a/js/extkeywidget.js b/js/extkeywidget.js
index d9fec5d38..0791b631d 100644
--- a/js/extkeywidget.js
+++ b/js/extkeywidget.js
@@ -269,7 +269,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 			if (item.obsolescence_flag == '1') {
 				val = val+' <span class="object-ref-icon text_decoration"><span class="fas fa-eye-slash object-obsolete fa-1x fa-fw"></span></span>';
 			}
-			let labelValue = $('<div/>').html(item.label).text().replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+term+")(?![^<>]*>)(?![^&;]+;)", "gi"), "<strong>$1</strong>");
+			let labelValue = item.label.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+term+")(?![^<>]*>)(?![^&;]+;)", "gi"), "<strong>$1</strong>");
 			val = val+labelValue;
 			if (item.additional_field != undefined) {
 				val = val+'<br><i>'+item.additional_field+'</i>';