diff --git a/app/components/comment_component/comment_component.js b/app/components/comment_component/comment_component.js
index 22a626354..58b5c6f60 100644
--- a/app/components/comment_component/comment_component.js
+++ b/app/components/comment_component/comment_component.js
@@ -16,6 +16,7 @@ class CommentComponent {
     var $form = $(e.target).closest("div.new-comment").find("form");
     $form.show();
     $form[0].scrollIntoView(false);
+    $form.find("textarea").selectEnd();
     e.preventDefault();
   }
 
diff --git a/app/components/forum_post_component/forum_post_component.js b/app/components/forum_post_component/forum_post_component.js
index 37b19931e..67d566a01 100644
--- a/app/components/forum_post_component/forum_post_component.js
+++ b/app/components/forum_post_component/forum_post_component.js
@@ -13,7 +13,8 @@ class ForumPostComponent {
 
   static showNewForumPostForm(e) {
     $("#topic-response").show();
-    document.body.scrollIntoView(false);
+    $("#forum_post_body").get(0).scrollIntoView(false);
+    $("#forum_post_body").selectEnd();
     e.preventDefault();
   }
 
diff --git a/app/views/forum_posts/new.js.erb b/app/views/forum_posts/new.js.erb
index 92bcc3378..6f9805b99 100644
--- a/app/views/forum_posts/new.js.erb
+++ b/app/views/forum_posts/new.js.erb
@@ -4,5 +4,5 @@ if ($("#forum_post_body").val().length > 0) {
 }
 $("#forum_post_body").val(msg);
 $("#topic-response").show();
-document.body.scrollIntoView(false);
+$("#forum_post_body").get(0).scrollIntoView(false);
 $("#forum_post_body").selectEnd();