diff --git a/app/assets/javascripts/discourse/views/topic_view.js b/app/assets/javascripts/discourse/views/topic_view.js
index 2659d0139e1..eb2d4d720ca 100644
--- a/app/assets/javascripts/discourse/views/topic_view.js
+++ b/app/assets/javascripts/discourse/views/topic_view.js
@@ -235,7 +235,8 @@ Discourse.TopicView.reopenClass({
       new LockOn(holderId, {offsetCalculator: function() {
         var $header = $('header'),
             $title = $('#topic-title'),
-            expectedOffset = $title.height() - $header.find('.contents').height();
+            windowHeight = $(window).height() - $title.height(),
+            expectedOffset = $title.height() - $header.find('.contents').height() + (windowHeight / 5);
 
         return $header.outerHeight(true) + ((expectedOffset < 0) ? 0 : expectedOffset);
       }}).lock();