diff --git a/app/assets/javascripts/discourse/views/post_view.js b/app/assets/javascripts/discourse/views/post_view.js
index eddef49087..15c9f009cc 100644
--- a/app/assets/javascripts/discourse/views/post_view.js
+++ b/app/assets/javascripts/discourse/views/post_view.js
@@ -243,6 +243,7 @@ Discourse.PostView = Discourse.View.extend({
     // Find all the quotes
     this.insertQuoteControls();
 
+    $post.addClass('ready');
     // be sure that eyeline tracked it
     var controller = this.get('controller');
     if (controller && controller.postRendered) {
diff --git a/app/assets/javascripts/discourse/views/topic_view.js b/app/assets/javascripts/discourse/views/topic_view.js
index e1c84aa6ee..d6485c367f 100644
--- a/app/assets/javascripts/discourse/views/topic_view.js
+++ b/app/assets/javascripts/discourse/views/topic_view.js
@@ -397,7 +397,7 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
 
   updatePosition: function(userActive) {
 
-    var rows = $('.topic-post');
+    var rows = $('.topic-post.ready');
     if (!rows || rows.length === 0) { return; }
 
     // if we have no rows
@@ -486,7 +486,8 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
       latestLink: "<a href=\"/\">" + (Em.String.i18n("topic.view_latest_topics")) + "</a>"
     };
 
-    if (category = this.get('controller.content.category')) {
+    category = this.get('controller.content.category');
+    if (category) {
       opts.catLink = Discourse.Utilities.categoryLink(category);
     } else {
       opts.catLink = "<a href=\"" + Discourse.getURL("/categories") + "\">" + (Em.String.i18n("topic.browse_all_categories")) + "</a>";