diff --git a/swh/web/ui/templates/search-form.html b/swh/web/ui/templates/search-form.html
new file mode 100644
index 000000000..1303828c5
--- /dev/null
+++ b/swh/web/ui/templates/search-form.html
@@ -0,0 +1,72 @@
+<!-- The text-based SHA1 or SHA256 search -->
+<h2>Search with SHA-1 or SHA-256:</h2>
+<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>
+
+<!-- The file-based drag&drop UI-->
+<h2>Search with files</h2>
+<form id="file-hash-form"
+      action="{{ url_for('search_content') }}"
+      class="text-center form"
+      method="post"
+      enctype="multipart/form-data">
+  
+  <!--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>
+
+<!-- Required JS -->
+<script src="{{ url_for('static', filename='lib/core.js') }}"></script>
+<script src="{{ url_for('static', filename='lib/lib-typedarrays.js') }}"></script>
+<script src="{{ url_for('static', filename='lib/sha1.js') }}"></script>
+<script src="{{ url_for('static', filename='lib/sha256.js') }}"></script>
+<script src="{{ url_for('static', filename='js/search.js') }}"></script>
+
+<!-- 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/search.html b/swh/web/ui/templates/search.html
index 3cce4e808..d8ee8b7f3 100644
--- a/swh/web/ui/templates/search.html
+++ b/swh/web/ui/templates/search.html
@@ -1,117 +1,47 @@
 {% extends "layout.html" %}
 {% block title %}Search SWH{% endblock %}
 {% block content %}
 
-<script src="{{ url_for('static', filename='lib/core.js') }}"></script>
-<script src="{{ url_for('static', filename='lib/lib-typedarrays.js') }}"></script>
-<script src="{{ url_for('static', filename='lib/sha1.js') }}"></script>
-<script src="{{ url_for('static', filename='lib/sha256.js') }}"></script>
-<script src="{{ url_for('static', filename='js/search.js') }}"></script>
-
 <div class="container">
-  <!-- The text-based SHA1 or SHA256 search -->
-  <h1 class="label label-default">Search with SHA-1 or SHA-256:</h1>
-  <form id="text-hash-form"
-	action="{{ url_for('search') }}"
-	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>
-
-  <!-- The file-based drag&drop UI-->
-  <h1 class="label label-default">Search with files</h1>
-  <form id="file-hash-form"
-	action="{{ url_for('search') }}"
-	class="text-center form"
-        method="post"
-        enctype="multipart/form-data">
-
-    <!--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="container 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>
-
-  <div id="search-message" class="message"></div>
+  <!-- Include the predefined search form-->
+  {% include 'search-form.html' %}
   
-  <!-- Search forms 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>
-
   {% if search_res is not none %}
   <!-- Search result display -->
-      {% if search_stats is not none %}
-      <label class="search-stats">
-         Files available in SWH: {{ '%.2f' | format(search_stats['pct']) }}% of
-         {{ search_stats['nbfiles'] }} files.
-      </label>
-      {% endif %}
+  {% if search_stats is not none %}
+  <label class="search-stats">
+    Files available in SWH: {{ '%.2f' | format(search_stats['pct']) }}% of
+    {{ search_stats['nbfiles'] }} files.
+  </label>
+  {% endif %}
+
   <table class="table table-striped search-res">
     <thead class="thead-default">
       <th>File name</th>
       <th>SHA1 checksum</th>
       <th>Result</th>
     </thead>
     {% for res in search_res %}
     <tr>
       {% if res['filename'] is not none %}
       <td>{{ res['filename'] }}</td>
       {% else %}
       <td>From text input</td>
       {% endif %}
       {% if res['found'] %}
       <td><a href="{{ url_for('browse_content', q=res['sha1']) }}">{{ res['sha1'] }}</a></td>
       <td><span class="glyphicon glyphicon-ok file-found"></span></td>
       {% else %}
       <td>{{ res['sha1'] }}</td>
       <td><span class="glyphicon glyphicon-remove file-notfound"></span></td>
       {% endif %}
     </tr>
     {% endfor %}
   </table>
   {% endif %}
   {% if message is not none and message != '' %}
-    <div class="span8">{{ message | safe }}</div>
-  </div>
-  {% endif %}
+  <div class="span8">{{ message | safe }}</div>
+</div>
+{% endif %}
 </div>
 {% endblock %}