diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index 77c553d..9259785 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -125,9 +125,17 @@ function updateHighlight() {
     for (var i = lines[lines.length - 1]; i >= lines[0]; i--) {
       $('[data-line-number=' + i + ']').closest('tr').addClass(cls);
     }
+    return lines;
   }
+  return [];
 }
-$(document).ready(updateHighlight);
+$(document).ready(function () {
+  var lines = updateHighlight();
+  if (lines) {
+    var offset = $('[data-line-number=' + lines[0] + ']').offset().top;
+    $('html, body').animate({scrollTop: offset}, 200);
+  }
+});
 $(window).on('hashchange', updateHighlight);
 var selected = [];
 $("[data-line-number]").click(function (ev) {