diff --git a/app/assets/javascripts/app/views/single-post-viewer/single_post_actions.js b/app/assets/javascripts/app/views/single-post-viewer/single_post_actions.js
index 826814fcb..a1cb8341f 100644
--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_actions.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_actions.js
@@ -9,7 +9,7 @@ app.views.SinglePostActions = app.views.Feedback.extend({
 
   focusComment: function() {
     $('.comment_box').focus();
-    $("html, body").animate({ scrollTop: $(document).height()-$(window).height() }); // Go to the bottom.
+    $('html,body').animate({scrollTop: $('.comment_box').offset().top - ($('.comment_box').height() + 20)});
     return false;
   }