diff --git a/app/assets/javascripts/discourse/views/list/topic_list_item_view.js b/app/assets/javascripts/discourse/views/list/topic_list_item_view.js
index fb91b9c2bb..b59347dc9a 100644
--- a/app/assets/javascripts/discourse/views/list/topic_list_item_view.js
+++ b/app/assets/javascripts/discourse/views/list/topic_list_item_view.js
@@ -25,7 +25,7 @@ Discourse.TopicListItemView = Discourse.GroupedView.extend({
       });
   },
 
-  didInsertElement: function() {
+  _highlightIfNeeded: function() {
     var session = Discourse.Session.current();
 
     // highligth the last topic viewed
@@ -37,6 +37,6 @@ Discourse.TopicListItemView = Discourse.GroupedView.extend({
       this.set('content.highlight', false);
       this.highlight();
     }
-  }
+  }.on('didInsertElement')
 
 });