diff --git a/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars b/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars
index 833ac3d5383..ae557f855ba 100644
--- a/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/search/topic_result.js.handlebars
@@ -1,6 +1,6 @@
 <a class='search-link' href='{{unbound url}}'>
   <span class='topic'>
-  {{topic-status topic=topic disableActions=true}}{{unbound topic.title}}{{category-badge topic.category}}
+    {{topic-status topic=topic disableActions=true}}<span class='topic-title'>{{unbound topic.title}}</span>{{category-badge topic.category}}
   </span>
   {{#unless Discourse.Mobile.mobileView}}
   <span class='blurb'>
diff --git a/app/assets/javascripts/discourse/views/search-results-type.js.es6 b/app/assets/javascripts/discourse/views/search-results-type.js.es6
index e914d2ceb8f..31a55de99b0 100644
--- a/app/assets/javascripts/discourse/views/search-results-type.js.es6
+++ b/app/assets/javascripts/discourse/views/search-results-type.js.es6
@@ -8,7 +8,8 @@ export default Ember.CollectionView.extend({
   didInsertElement: function(){
     var term = this.get('controller.term');
     if(!_.isEmpty(term)) {
-      this.$().highlight(term.split(/\s+/));
+      this.$('.blurb').highlight(term.split(/\s+/));
+      this.$('.topic-title').highlight(term.split(/\s+/), {className: 'highlighted'} );
     }
   }
 });