diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
index 16333eb951..107383d935 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
@@ -20,7 +20,9 @@ export default class PostCooked {
   }
 
   update(prev) {
-    if (prev.attrs.cooked !== this.attrs.cooked) {
+    if ((prev.attrs.cooked !== this.attrs.cooked) ||
+        (prev.attrs.highlightTerm !== this.attrs.highlightTerm)) {
+
       return this.init();
     }
   }
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 5bd25047f1..39921dbc62 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -64,6 +64,7 @@ const SearchHelper = {
         }
 
         searchData.results = content;
+        widget.appEvents.trigger('post-stream:refresh', { force: true });
       }).finally(() => {
         searchData.loading = false;
         widget.scheduleRerender();
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index 5929078b28..d388d67787 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -69,6 +69,11 @@ QUnit.test("Search with context", assert => {
 
   andThen(() => {
     assert.ok(exists('.search-menu .results ul li'), 'it shows results');
+
+    assert.ok(
+      exists('.cooked span.highlight-strong'),
+      'it should highlight the search term'
+    );
   });
 
   visit("/");