diff --git a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6 b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
index cd6acccc815..9c414daac03 100644
--- a/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic-from-params.js.es6
@@ -34,7 +34,11 @@ export default Discourse.Route.extend({
         progressPosition: progress,
         expanded: false
       });
-      self.appEvents.trigger('post:highlight', closest);
+
+      // Highlight our post after the next render
+      Ember.run.scheduleOnce('afterRender', function() {
+        self.appEvents.trigger('post:highlight', closest);
+      });
       Discourse.URL.jumpToPost(closest);
 
       if (topic.present('draft')) {