diff --git a/resource/css/styles.css b/resource/css/styles.css
index 977f251c7..e5f9719a5 100644
--- a/resource/css/styles.css
+++ b/resource/css/styles.css
@@ -2126,7 +2126,7 @@ span.date-info {
   float: right;
 }
 
-.tt-selectable > .concept-type {
+.tt-selectable > .concept-type, .autocomplete-label > div:first-child > span.concept-type {
   float: right;
   height: auto;
 }
@@ -2135,7 +2135,7 @@ span.date-info {
   overflow: hidden;
 }
 
-.autocomplete-label > span {
+.autocomplete-label > div:first-child > span:first-child, .autocomplete-label > div:first-child > span.replaced + span {
   color: var(--medium-color);
   margin: 0;
 }
diff --git a/resource/js/docready.js b/resource/js/docready.js
index 6632cac19..0e3d044d1 100644
--- a/resource/js/docready.js
+++ b/resource/js/docready.js
@@ -750,13 +750,15 @@ $(function() { // DOCUMENT READY
 
   var autocompleteTemplate =[
     '<div class="autocomplete-label">',
+    '<div>',
     '{{# if matched }}<span>{{matched}}{{# if lang}} ({{lang}}){{/if}} = </span>{{/if}}',
     '{{# if replaced }}<span class="replaced">{{replaced}}{{# if lang}} ({{lang}}){{/if}} &rarr; </span>{{/if}}',
     '{{# if notation }}<span>{{notation}}</span>{{/if}}',
     '<span>{{label}}{{# if lang}}{{# unless matched }}<span>({{lang}})</span>{{/unless}}{{/if}}</span>',
     '{{# if typeLabel }}<span class="concept-type">{{typeLabel}}</span>{{/if}}',
     '</div>',
-    '<div class="vocab">{{vocabLabel}}</div>'
+    '<div class="vocab">{{vocabLabel}}</div>',
+    '</div>'
   ].join('');
 
   if ($('.headerbar').length > 0) {