diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index de8a826..3d14a7c 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -659,31 +659,6 @@ function setup_reply_btns() {
   setup_edit_btns();
   setup_reply_btns();
 
-  var cur_hash = null;
-
-  highlight_comment = function() {
-    var _hash = window.location.hash;
-    console.log(_hash);
-    if (_hash == '#commit_list' || _hash == '#request_diff') {
-        return false;
-    }
-    if (_hash != cur_hash) {
-      $( cur_hash ).css(
-        "background", "linear-gradient(to bottom, #ededed 0%, #fff 100%)"
-      );
-    };
-    cur_hash = _hash;
-    if ( _hash ) {
-      $( _hash ).css(
-        "background", "linear-gradient(to bottom, #eded98 0%, #fff 100%)"
-      );
-    };
-    return false;
-  };
-
-  $(window.onload=highlight_comment());
-  $(window).on('hashchange', highlight_comment);
-
   $(".comment_body").each(function(ind, obj) {
     var source = $(obj).html();
     var preview = emojione.toImage(source);
@@ -820,6 +795,39 @@ function try_async_comment(form, inline) {
 
 </script>
 
+<script type="text/javascript">
+function updateHighlight() {
+  var cls = "highlighted-line";
+  $('.' + cls).removeClass(cls)
+  if (location.hash !== '') {
+    var file = location.hash.substr(2).split(',')[0];
+    var lines = location.hash.substr(4).split('-').map(function (x) { return parseInt(x, 10) });
+    for (var i = lines[lines.length - 1]; i >= lines[0]; i--) {
+      $('#' + file + '_' + i).closest('tr').addClass(cls);
+    }
+  }
+}
+$(document).ready(updateHighlight);
+$(window).on('hashchange', updateHighlight);
+var selected = [];
+$("[data-line-number]").click(function (ev) {
+  var line = $(this).attr('data-line-number');
+  var file = $(this).attr('id').split('_')[0];
+  if (ev.shiftKey) {
+    selected = selected.slice(-1).concat(line);
+  } else {
+    selected = [line];
+  }
+
+  var hash = '_' + file + ',' + selected[0];
+  if (selected.length === 2) {
+    hash = '_' + file + ',' + Math.min(selected[0], selected[1]) + '-' + Math.max(selected[0], selected[1]);
+  }
+  window.location.hash = hash;
+  return false;
+});
+</script>
+
 
 {% if config['EVENTSOURCE_SOURCE'] and pull_request %}
 <script type="text/javascript"