diff --git a/core/misc/autocomplete.js b/core/misc/autocomplete.js
index 5a1c156d0b..21f391647e 100644
--- a/core/misc/autocomplete.js
+++ b/core/misc/autocomplete.js
@@ -201,7 +201,9 @@
    */
   function renderItem(ul, item) {
     return $('<li>')
-      .append($('<a>').html(item.label))
+      .attr('data-value', item.value)
+      .append($('<a>').attr('aria-label', item.value)
+      .html('<span aria-hidden="true">' + item.label.replace(new RegExp(this.term, 'i'), '<strong class="autocomplete-search-term">$&</strong>') + '</span>')
       .appendTo(ul);
   }