diff --git a/swh/web/ui/templates/browse.html b/swh/web/ui/templates/browse.html
index 64d7c6be..f15f2b86 100644
--- a/swh/web/ui/templates/browse.html
+++ b/swh/web/ui/templates/browse.html
@@ -1,49 +1,55 @@
 {% extends "layout.html" %}
 {% block title %}Browse{% endblock %}
 {% block content %}
 
 <div class="browse-panel panel panel-default">
   <div class="panel panel-body">
 
     <ul class="nav nav-tabs" role="tablist">
       <li><a class="nav-link active" data-toggle="tab" href="#tab-content" role="tabpanel">Content</a></li>
+      <li><a class="nav-link" data-toggle="tab" href="#tab-search" role="tabpanel">Search</a></li>
       <li><a class="nav-link" data-toggle="tab" href="#tab-revision" role="tabpanel">Revision</a></li>
       <li><a class="nav-link" data-toggle="tab" href="#tab-origin" role="tabpanel">Origin</a></li>
       <li><a class="nav-link" data-toggle="tab" href="#tab-directory" role="tabpanel">Directory</a></li>
     </ul>
 
     <div class="tab-content container-fluid">
       <!-- Content pane -->
       <div class="tab-pane active" id="tab-content" role="tabpanel">
         {% include 'includes/home-content.html' %}
       </div>
 
+      <!-- Search Symbol pane -->
+      <div class="tab-pane" id="tab-search" role="tabpanel">
+        {% include 'includes/home-search-symbol.html' %}
+      </div>
+
       <!-- Revision pane -->
       <div class="tab-pane" id="tab-revision" role="tabpanel">
         {% include 'includes/home-revision.html' %}
       </div>
 
       <!-- Origin pane -->
       <div class="tab-pane" id="tab-origin" role="tabpanel">
         {% include 'includes/home-origin.html' %}
       </div>
 
       <!-- Directory pane -->
       <div class="tab-pane" id="tab-directory" role="tabpanel">
         {% include 'includes/home-directory.html' %}
       </div>
     </div>
 
   </div>
 </div>
 
 <script>
     // Hash update on page load
     var hash = window.location.hash;
     hash && $('ul.nav a[href="' + hash + '"]').tab('show');
     // Hash update on nav-tab click
     $('.nav-tabs a').click(function(e) {
         window.location.hash = this.hash;
     })
 </script>
 {% endblock %}
diff --git a/swh/web/ui/templates/includes/home-search-symbol.html b/swh/web/ui/templates/includes/home-search-symbol.html
new file mode 100644
index 00000000..b333073d
--- /dev/null
+++ b/swh/web/ui/templates/includes/home-search-symbol.html
@@ -0,0 +1,27 @@
+<!-- The symbol search-->
+<label for="file-hash-form">Search symbol</label>
+<div class="simple-desc container-fluid">
+  Permits to lookup symbols in content that SWH
+  indexed (i.e. a file that we have in our database).
+</div>
+<form id="file-hash-form"
+      action="{{ url_for('search_symbol') }}"
+      class="text-center form"
+      method="get">
+
+  <br/>
+  <div class="input-group">
+    <input id="text-symbol-input"
+           type="text" class="form-control"
+           name="q"
+           placeholder="Symbol to lookup" />
+    <span class="input-group-btn">
+      <button id="text-symbol-submit"
+              class="btn btn-primary"
+              type="submit">
+        Symbol search
+      </button>
+    </span>
+  </div>
+</form>
+<br />
diff --git a/swh/web/ui/templates/includes/search-form.html b/swh/web/ui/templates/includes/search-form.html
index ae18deea..e69d6ec7 100644
--- a/swh/web/ui/templates/includes/search-form.html
+++ b/swh/web/ui/templates/includes/search-form.html
@@ -1,102 +1,74 @@
 <!-- The text-based SHA1 or SHA256 search -->
 <label for="text-hash-form">Search with SHA-1 or SHA-256:</label>
 <form id="text-hash-form"
       action="{{ url_for('search_content') }}"
       class="form"
       method="get">
   <br/>
   <div class="input-group">
     <input id="text-hash-input"
            type="text" class="form-control"
            name="q"
            placeholder="SHA-1 or SHA-256 checksum" />
     <span class="input-group-btn">
       <button id="text-hash-submit"
               class="btn btn-primary"
               type="submit">
         Text search
       </button>
     </span>
   </div>
 </form>
 <br/>
 
 <!-- The file-based drag&drop UI-->
 <label for="file-hash-form">Search with files</label>
 <form id="file-hash-form"
       action="{{ url_for('search_content') }}"
       class="text-center form"
       method="post"
       enctype="multipart/form-data">
 
   <br/>
   <!--Form input -->
   <input type="file"
          id="file-hash-input"
          class="form-control"
          multiple
          name="filename"
          value=""
          style="display:none"
          placeholder="File(s) to hash and search" />
   <div id="file-drop" class="text-center" style="border: 1px dashed black">
     Drag and drop or click here to hash files and search for them.
     Your files will NOT be uploaded, hashing is done locally.
     Filesizes over 20Mb may be slow to process, use with care.
     <div id="filelist" class="row"></div>
   </div>
 
   <!-- Form buttons -->
   <div class="btn-group" style="margin-top: 10px">
     <button id="file-hash-submission" type="submit" class="btn btn-primary">
       <span class="glyphicon glyphicon-search" type="submit" aria-hidden="true"></span>
       Search
     </button>
     <button id="file-hash-clear" class="btn btn-primary">
       Clear
       <span class="glyphicon glyphicon-erase" aria-hidden="true"></span>
     </button>
   </div>
 </form>
 
-<br />
-<!-- The symbol search-->
-<label for="file-hash-form">Search symbol</label>
-<div class="simple-desc container-fluid">
-  Permits to lookup symbols in content that SWH
-  indexed (i.e. a file that we have in our database).
-</div>
-<form id="file-hash-form"
-      action="{{ url_for('search_symbol') }}"
-      class="text-center form"
-      method="get">
-
-  <br/>
-  <div class="input-group">
-    <input id="text-symbol-input"
-           type="text" class="form-control"
-           name="q"
-           placeholder="Symbol to lookup" />
-    <span class="input-group-btn">
-      <button id="text-symbol-submit"
-              class="btn btn-primary"
-              type="submit">
-        Symbol search
-      </button>
-    </span>
-  </div>
-</form>
-
 <br />
 
 <!-- Required JS -->
 {% for fname in ['lib/core.js', 'lib/lib-typedarrays.js', 'lib/sha1.js', 'lib/sha256.js', 'js/search.js'] %}
 <script language="javascript" type="text/javascript" src="{{ url_for('static', filename=fname) }}"></script>
 {% endfor %}
 
 <!-- Script setup -->
 <script>
   var sfc = new SearchFormController($('#text-hash-form'), $('#file-hash-form'), $('#search-message'));
   sfc.setupTextForm($('#text-hash-input'));
   sfc.setupFileForm($('#file-drop'),$('#filelist'),$('#file-hash-input'),$('#file-hash-clear'));
 </script>
diff --git a/swh/web/ui/templates/symbols.html b/swh/web/ui/templates/symbols.html
index 0e3bb14e..317befdc 100644
--- a/swh/web/ui/templates/symbols.html
+++ b/swh/web/ui/templates/symbols.html
@@ -1,78 +1,78 @@
 {% extends "layout.html" %}
 {% block title %}Search SWH{% endblock %}
 {% block content %}
 
 <div class="container">
   <!-- Include the predefined search form-->
-  {% include 'includes/search-form.html' %}
+  {% include 'includes/home-search-symbol.html' %}
 
   {% if result is not none %}
   <br />
   <div class="table-responsive">
     <table class="table table-striped search-res swhtable">
       <thead>
         <tr>
           <th>name</th>
           <th>content</th>
           <th>kind</th>
           <th>language</th>
         </tr>
       </thead>
       <tfoot>
         <tr>
           <th>name</th>
           <th>content</th>
           <th>kind</th>
           <th>language</th>
         </tr>
       </tfoot>
       <tbody>
       {% for res in result %}
         <tr>
           <td>{{ res['name'] | truncate(50) }}</td>
           <td><a href="{{ ('%s#l-%s' % (res['content_url'], res['line'])) }}">{{ res['sha1'] }}</a></td>
           <td>{{ res['kind'] }}</td>
           <td>{{ res['lang'] }}</td>
         </tr>
       {% endfor %}
       </tbody>
     </table>
 
   {% if linknext is not none and linknext != '' %}
     <br />
     <span><a href="{{ linknext }}">Next</a></span>
   {% endif %}
 
   {% endif %}
   {% if message is not none and message != '' %}
   <div class="span8">{{ message | safe }}</div>
   {% endif %}
 </div>
 
 <script type="text/javascript">
   $(document).ready(function() {
       // Setup - add a text input to each footer cell
       $('table.swhtable tfoot th').each( function () {
           var title = $(this).text();
           $(this).html('<input type="text" placeholder="Search '+title+'" />');
       });
 
       // DataTable
       var table = $('table.swhtable').DataTable({
           "paging": false
       });
 
       // Apply the search
       table.columns().every(function () {
           var that = this;
 
           $('input', this.footer()).on('keyup change', function () {
               if (that.search() !== this.value) {
                   that.search(this.value).draw();
               }
           });
       });
   });
 </script>
 
 {% endblock %}