diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6
index 09147836aca..309674a9aba 100644
--- a/app/assets/javascripts/discourse/models/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/post-stream.js.es6
@@ -696,6 +696,7 @@ export default RestModel.extend({
       const postNumber = post.get('post_number');
       if (postNumber && postNumber > (this.get('topic.highest_post_number') || 0)) {
         this.set('topic.highest_post_number', postNumber);
+        this.set('topic.last_posted_at', post.get('created_at'));
       }
 
       if (existing) {
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index e552c1e2332..1138e32785b 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -212,13 +212,13 @@ export default createWidget('topic-timeline', {
 
     if (stream.length < 3) { return; }
 
-    const rawLabel = relativeAge(new Date(topic.last_posted_at), { addAgo: true, defaultFormat: timelineDate });
 
     let result = [];
     if (currentUser && currentUser.get('canManageTopic')) {
       result.push(h('div.timeline-controls', this.attach('topic-admin-menu-button', { topic })));
     }
 
+    const bottomAge = relativeAge(new Date(topic.last_posted_at), { addAgo: true, defaultFormat: timelineDate });
     result = result.concat([this.attach('link', {
                               className: 'start-date',
                               rawLabel: timelineDate(createdAt),
@@ -227,8 +227,7 @@ export default createWidget('topic-timeline', {
                             this.attach('timeline-scrollarea', attrs),
                             this.attach('link', {
                               className: 'now-date',
-                              icon: 'dot-circle-o',
-                              rawLabel,
+                              rawLabel: bottomAge,
                               action: 'jumpBottom'
                             })]);