diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 825d96c88..8e7b75ef4 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -8,6 +8,12 @@ $.ajaxPrefilter(function (s) {
   }
 });
 
+function sanitizeHTML(string) {
+  var temp = document.createElement('span');
+  temp.textContent = string;
+  return temp.innerHTML;
+}
+
 function checkAll(id, checked) {
   $('#'+id).find('input[type=checkbox]:enabled').prop('checked', checked);
 }
@@ -1081,8 +1087,11 @@ function inlineAutoComplete(element) {
       lookup: 'label',
       fillAttr: 'label',
       requireLeadingSpace: true,
-      selectTemplate: function (issue) {
-        return '#' + issue.original.id;
+      selectTemplate: function ({ original }) {
+        return '#' + original.id;
+      },
+      menuItemTemplate: function ({ original }) {
+        return sanitizeHTML(original.label);
       },
       noMatchTemplate: function () {
         return '<span style:"visibility: hidden;"></span>';