diff --git a/rhodecode/templates/files/files.mako b/rhodecode/templates/files/files.mako
--- a/rhodecode/templates/files/files.mako
+++ b/rhodecode/templates/files/files.mako
@@ -314,7 +314,7 @@
         $(document).ready(function() {
             callbacks();
             var search_GET = "${request.GET.get('search','')}";
-            if (search_GET == "1") {
+            if (search_GET === "1") {
                 _NODEFILTER.initFilter();
             }
         });
diff --git a/rhodecode/templates/files/files_source.mako b/rhodecode/templates/files/files_source.mako
--- a/rhodecode/templates/files/files_source.mako
+++ b/rhodecode/templates/files/files_source.mako
@@ -106,4 +106,25 @@
         %endif
      %endif
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<script type="text/javascript">
+% if request.GET.get('mark'):
+
+$(function(){
+  $(".codehilite").mark(
+      "${request.GET.get('mark')}",
+          {
+              "className": 'match',
+              "accuracy": "complementary",
+              "ignorePunctuation": ":._(){}[]!'+=".split(""),
+              "each": function(el) {
+                  // and also highlight lines !
+                  $($(el).closest('tr')).find('td.cb-lineno').addClass('cb-line-selected');
+              }
+          }
+  );
+
+});
+% endif
+</script>