diff --git a/swh/web/templates/browse.html b/swh/web/templates/browse.html
index cd9017efb..c21af3f3d 100644
--- a/swh/web/templates/browse.html
+++ b/swh/web/templates/browse.html
@@ -1,152 +1,152 @@
 {% extends "layout.html" %}
 {% load swh_templatetags %}
 
 {% block title %}{{ heading }} – Software Heritage archive {% endblock %}
 
 {% block navbar-content %}
 <ul class="nav navbar-nav swh-browse-nav">
   <li class="active">
     <a href="#search" data-toggle="tab" style="outline:none;">Search</a>
   </li>
   <li>
     <a  href="#help" data-toggle="tab" style="outline:none;">Help</a>
   </li>
   <li>
     <a  href="#browse" data-toggle="tab" style="outline:none;">Browse</a>
   </li>
 </ul>
 {% endblock %}
 
 {% block content %}
 
 <div class="tab-content" style="margin-top: 5px;">
 
   <div class="tab-pane active" id="search">
     {% include "includes/origins-search.html" %}
   </div>
 
   <div class="tab-pane" id="help">
     {% include "includes/browse-help.html" %}
   </div>
 
   <div class="tab-pane" id="browse">
 
     {% if empty_browse %}
       <div class="panel panel-default" style="overflow-x: auto;">
         <div class="panel-heading">
           <h2>Browse the Software Heritage archive</h2>
         </div>
         <div class ="panel-body">
           <p>
             No Software Heritage object currently browsed.
             <br/>
             To browse the content of the archive, you can either use
             the <a href="{% url 'browse-homepage' %}#search">Search</a> interface or refer to the URI scheme described
             in the <a href="{% url 'browse-homepage' %}#help">Help</a> page.
           </p>
         </div>
       </div>
     {% else %}
       <div class="panel-group" id="accordion">
         {% if top_panel_visible %}
         <div class="panel panel-default" style="overflow-x: auto;">
             <div class="panel-heading">
               {% if top_panel_collapsible %}
               <a data-toggle="collapse" data-parent="#accordion" href="#swh-browse-top-collapse" style="outline:none;">
               {% endif %}
                 <div class="pull-left">
                   <h2>{{ top_panel_text_left }}</h2>
                 </div>
                 <div class="pull-right">
                   <h2>{{ top_panel_text_right }}</h2>
                 </div>
                 <div class="clearfix"></div>
               {% if top_panel_collapsible %}
               </a>
               {% endif %}
 
             </div>
             {% if top_panel_collapsible %}
             <div id="swh-browse-top-collapse" class="panel-collapse collapse">
             {% endif %}
               <table class="table">
                 <tbody>
                   {% for key, val in swh_object_metadata.items|dictsort:"0.lower" %}
                     <tr>
                       <th class="swh-metadata-table-row">{{ key }}</th>
                       <td class="swh-metadata-table-row">
                         <pre>{{ val | safe | urlize_links_and_mails | safe }}</pre>
                       </td>
                     </tr>
                   {% endfor %}
                 </tbody>
               </table>
             {% if top_panel_collapsible %}
             </div>
             {% endif %}
         </div>
         {% endif %}
         {% if main_panel_visible %}
         <div class="panel panel-default" style="overflow-x: auto;">
           {% block swh-browse-main-panel-content %}{% endblock %}
         </div>
         {% endif %}
 
         {% block swh-browse-panels-group-end %}{% endblock %}
 
       </div>
 
       {% block swh-browse-after-panels %}{% endblock %}
 
     </div>
   {% endif %}
 
 </div>
 
 <script>
 
   function removeHash () {
-    history.pushState("", document.title, window.location.pathname + window.location.search);
+    history.replaceState("", document.title, window.location.pathname + window.location.search);
   }
 
   var browse_tabs_hash = ["#browse", "#search", "#help"];
 
   // Javascript to enable link to tab
   function show_requested_tab() {
     var hash = window.location.hash;
     if (hash && browse_tabs_hash.indexOf(hash) == -1) {
       return;
     }
     if (hash) {
       $('.navbar-nav.swh-browse-nav a[href="' + hash + '"]').tab('show');
     } else {
       $('.navbar-nav.swh-browse-nav a[href="#browse"]').tab('show');
     }
       window.scrollTo(0, 0);
   }
 
   // show requested tab when loading the page
   $(document).ready(function() {
 
     // Change hash for page reload
     $('.navbar-nav.swh-browse-nav a').on('shown.bs.tab', function (e) {
       if (e.target.hash != '#browse') {
         window.location.hash = e.target.hash;
       } else {
         removeHash();
       }
       show_requested_tab();
     });
 
     // update displayed tab when the url fragment changes
     $(window).on('hashchange', function() {
       show_requested_tab();
     });
 
     show_requested_tab();
   });
 
 </script>
 
 
 {% endblock %}
diff --git a/swh/web/templates/content.html b/swh/web/templates/content.html
index 48f9be72e..60fbf2fb4 100644
--- a/swh/web/templates/content.html
+++ b/swh/web/templates/content.html
@@ -1,133 +1,134 @@
 {% extends "browse.html" %}
 {% load static %}
 
 {% block header %}
 <script src="{% static 'js/highlightjs/dist/highlight.pack.js' %}"></script>
 <script src="{% static 'js/highlightjs-line-numbers/dist/highlightjs-line-numbers.min.js' %}"></script>
 <script>
   // empty hljs language definition
   function no_highlight(hljs) {
     return {}
   }
   // just a trick to get line numbers working when no highlight
   // has to be performed
   hljs.registerLanguage('nohighlight-swh', no_highlight);
 
   // keep track of the first highlighted line
   var first_hl_line = null;
   // highlighting color
   var line_hl_color = 'rgb(193, 255, 193)';
 
   // function to highlight a line
   function highlight_line(i) {
     var line_td = $('div[data-line-number="' + i + '"]').parent().parent();
     line_td.css('background-color', line_hl_color);
     return line_td;
   }
 
   function remove_hash () {
-    history.pushState("", document.title, window.location.pathname + window.location.search);
+    history.replaceState("", document.title, window.location.pathname + window.location.search);
   }
 
   // function to reset highlighting
   function reset_highlighted_lines() {
     first_hl_line = null;
     $('tr').css('background-color', 'inherit');
   }
 
   function scroll_to_line(lineDomElt) {
     $('html, body').animate({
       scrollTop: $(lineDomElt).offset().top - 70
     }, 500);
   }
 
   // function to highlight lines based on a url fragment
   // in the form '#Lx' or '#Lx-Ly'
   function parse_url_fragment_for_lines_to_highlight() {
     var lines = [];
     var lines_regexp = new RegExp(/L(\d+)/g);
     var line = lines_regexp.exec(window.location.hash);
     while (line) {
       lines.push(parseInt(line[1]));
       line = lines_regexp.exec(window.location.hash);
     }
     reset_highlighted_lines();
     if  (lines.length == 1) {
       first_hl_line = parseInt(lines[0]);
       scroll_to_line(highlight_line(lines[0]));
     } else if (lines[0] < lines[lines.length - 1]) {
       first_hl_line = parseInt(lines[0]);
       scroll_to_line(highlight_line(lines[0]));
       for (var i = lines[0]+1; i <= lines[lines.length - 1]; ++i) {
         highlight_line(i);
       }
     }
   }
 
   $(document).ready(function() {
     // highlight code and add line numbers
     $('code').each(function(i, block) {
       hljs.highlightBlock(block);
       hljs.lineNumbersBlock(block);
     });
     // click handler to dynamically highlight line(s)
     // when the user clicks on a line number (lines range
     // can also be highlighted while holding the shift key)
     $('body').click(function(evt) {
       if (evt.target.classList.contains('hljs-ln-n')) {
         var line = parseInt($(evt.target).data('line-number'));
         if (evt.shiftKey && first_hl_line && line > first_hl_line) {
           var first_line = first_hl_line;
           reset_highlighted_lines();
           for (var i = first_line; i <= line; ++i) {
             highlight_line(i);
           }
           first_hl_line = first_line;
           window.location.hash = '#L' + first_line + "-L" + line;
         } else {
           reset_highlighted_lines();
           highlight_line(line);
           window.location.hash = '#L' + line;
           scroll_to_line(evt.target);
         }
       } else {
         reset_highlighted_lines();
         remove_hash();
       }
     });
 
     // update lines highlighting when the url fragment changes
     $(window).on('hashchange', function() {
       parse_url_fragment_for_lines_to_highlight();
     });
 
     // highlight lines specified by an url fragment
+    $('.navbar-nav.swh-browse-nav a[href="#browse"]').tab('show');
     parse_url_fragment_for_lines_to_highlight();
 
   });
 
 </script>
 <link rel="stylesheet" href="{% static 'css/highlightjs/github.css' %}">
 {% endblock %}
 
 {% block swh-browse-main-panel-content %}
 
 {% include "includes/top-navigation.html" %}
 
 <div class="well well-sm swh-content" style="margin-bottom: 0px">
 {% if "inode/x-empty" == mimetype %}
 <i>File is empty</i>
 {% elif "text/" in mimetype %}
 <div class="highlightjs">
   <pre>
     <code class="{{ language }}">{{ content }}</code>
   </pre>
 </div>
 {% elif "image/" in mimetype and content %}
   <img src="data:{{ mimetype }};base64,{{ content }}"/>
 {% else %}
 Content with mime type {{ mimetype }} can not be displayed
 {% endif %}
 </div>
 
 {% endblock %}