diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index a611d8033..92e06d8f8 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -41,6 +41,20 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, {
 
   }.observes('controllers.search.term', 'controllers.header.visibleDropdown'),
 
+  postStreamLoadedAllPostsChanged: function(){
+    // hold back rendering 1 run loop for every transition.
+    var self = this;
+    var loaded = this.get('postStream.loadedAllPosts');
+    this.set('loadedAllPosts', false);
+
+    if(loaded){
+      Em.run.next(function(){
+        self.set('loadedAllPosts',true);
+      });
+    }
+
+  }.observes('postStream', 'postStream.loadedAllPosts'),
+
   show_deleted: function(key, value) {
     var postStream = this.get('postStream');
     if (!postStream) { return; }
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 0a63267ea..54f6fad5c 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -90,7 +90,7 @@
         <div id='topic-bottom'></div>
 
         {{#loading-spinner condition=postStream.loadingFilter}}
-          {{#if postStream.loadedAllPosts}}
+          {{#if loadedAllPosts}}
 
             {{view 'topic-closing' topic=model}}
             {{view 'topic-footer-buttons' topic=model}}