diff --git a/web_src/js/index.js b/web_src/js/index.js
index c00b3aaeb0..67548f5d9d 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -1343,7 +1343,7 @@ function initPullRequestReview() {
         $(`#code-comments-${id}`).removeClass('hide');
         $(`#code-preview-${id}`).removeClass('hide');
         $(`#hide-outdated-${id}`).removeClass('hide');
-        $(window).scrollTop(commentDiv.offset().top);
+        commentDiv[0].scrollIntoView();
       }
     }
   }
diff --git a/web_src/less/_review.less b/web_src/less/_review.less
index 9197050913..2b15eec82d 100644
--- a/web_src/less/_review.less
+++ b/web_src/less/_review.less
@@ -173,3 +173,11 @@ a.blob-excerpt:hover {
 .review-box > .segment {
   border: none !important;
 }
+
+.pull.files.diff [id] {
+  scroll-margin-top: 99px;
+
+  @media @mediaMdAndDown {
+    scroll-margin-top: 130px;
+  }
+}