diff --git a/swh/web/assets/src/bundles/browse/browse.css b/swh/web/assets/src/bundles/browse/browse.css
index bac22dbf..c5b43499 100644
--- a/swh/web/assets/src/bundles/browse/browse.css
+++ b/swh/web/assets/src/bundles/browse/browse.css
@@ -1,109 +1,101 @@
 /**
  * Copyright (C) 2018  The Software Heritage developers
  * See the AUTHORS file at the top-level directory of this distribution
  * License: GNU Affero General Public License version 3, or any later version
  * See top-level LICENSE file for more information
  */
 
 .navbar-header a,
 ul.dropdown-menu a,
 ul.navbar-nav a {
     border-bottom-style: none;
     color: #323232;
     font-weight: 700;
 }
 
 .swh-browse-nav li a {
     border-radius: 4px;
 }
 
 .nav-link.active {
     background-color: #e7e7e7;
 }
 
 .scrollable-menu {
     max-height: 180px;
     overflow-x: hidden;
 }
 
 .swh-corner-ribbon {
     width: 200px;
     background: #e43;
     position: absolute;
     text-align: center;
     line-height: 50px;
     letter-spacing: 1px;
     color: #f0f0f0;
     box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
     top: 25px;
     right: -50px;
     left: auto;
     transform: rotate(45deg);
     z-index: 2000;
 }
 
 .swh-loading {
     display: none;
 }
 
 .swh-loading.show {
-    display: inline-block;
-    position: fixed;
-    background: white;
-    border: 1px solid black;
-    top: 50%;
-    left: 50%;
-    margin: -50px 0 0 -50px;
-    text-align: center;
-    z-index: 100;
+    display: block;
 }
 
 .swh-metadata-table-row {
     border-top: 1px solid #ddd !important;
 }
 
 .swh-metadata-table-key {
     min-width: 200px;
     max-width: 200px;
     width: 200px;
 }
 
 .swh-metadata-table-value pre {
     white-space: pre-wrap;
 }
 
 .swh-table-even-odd th {
     border-top: none;
 }
 
 .swh-table-even-odd tr:nth-child(even) {
     background-color: #f5f5f5;
 }
 
 .swh-table-even-odd tr:nth-child(odd) {
     background-color: #fff;
 }
 
 .swh-table-cell-text-overflow {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
 
 .swh-directory-table {
     margin-bottom: 0;
 }
 
 .swh-directory-table td {
     border-top: 1px solid #ddd !important;
 }
 
 .swh-title-color {
     color: #e20026;
 }
 
 .swh-log-entry-message {
     min-width: 460px;
     max-width: 460px;
     width: 460px;
 }
diff --git a/swh/web/assets/src/bundles/browse/origin-search.js b/swh/web/assets/src/bundles/browse/origin-search.js
index b2f39051..b86ab6b3 100644
--- a/swh/web/assets/src/bundles/browse/origin-search.js
+++ b/swh/web/assets/src/bundles/browse/origin-search.js
@@ -1,159 +1,164 @@
 /**
  * Copyright (C) 2018  The Software Heritage developers
  * See the AUTHORS file at the top-level directory of this distribution
  * License: GNU Affero General Public License version 3, or any later version
  * See top-level LICENSE file for more information
  */
 
 import {heapsPermute} from 'utils/heaps-permute';
 import {handleFetchError} from 'utils/functions';
 
 let originPatterns;
 let perPage = 15;
 let limit = perPage * 10;
 let offset = 0;
 let currentData = null;
 let inSearch = false;
 
 function fixTableRowsStyle() {
   setTimeout(() => {
     $('#origin-search-results tbody tr').removeAttr('style');
   });
 }
 
+function clearOriginSearchResultsTable() {
+  $('#origin-search-results tbody tr').remove();
+}
+
 function populateOriginSearchResultsTable(data, offset) {
   let localOffset = offset % limit;
   if (data.length > 0) {
     $('#swh-origin-search-results').show();
     $('#swh-no-origins-found').hide();
-    $('#origin-search-results tbody tr').remove();
+    clearOriginSearchResultsTable();
     let table = $('#origin-search-results tbody');
     for (let i = localOffset; i < localOffset + perPage && i < data.length; ++i) {
       let elem = data[i];
       let tableRow = '<tr>';
       tableRow += '<td style="width: 120px;">' + elem.type + '</td>';
       let browseUrl = Urls.browse_origin(elem.type, elem.url);
       tableRow += '<td style="white-space: nowrap;"><a href="' + browseUrl + '">' + browseUrl + '</a></td>';
       tableRow += '<td id="visit-status-origin-' + elem.id + '"><i title="Checking visit status" class="fa fa-refresh fa-spin"></i></td>';
       tableRow += '</tr>';
       table.append(tableRow);
       // get async latest visit snapshot and update visit status icon
       let latestSnapshotUrl = Urls.browse_origin_latest_snapshot(elem.id);
       fetch(latestSnapshotUrl, {credentials: 'same-origin'})
         .then(response => response.json())
         .then(data => {
           let originId = elem.id;
           $('#visit-status-origin-' + originId).children().remove();
           if (data) {
             $('#visit-status-origin-' + originId).append('<i title="Origin has at least one full visit by Software Heritage" class="fa fa-check"></i>');
           } else {
             $('#visit-status-origin-' + originId).append('<i title="Origin has not yet been visited by Software Heritage or does not have at least one full visit" class="fa fa-times"></i>');
           }
         });
     }
     fixTableRowsStyle();
   } else {
     $('#swh-origin-search-results').hide();
     $('#swh-no-origins-found').show();
   }
   if (data.length - localOffset < perPage ||
       (data.length < limit && (localOffset + perPage) === data.length)) {
     $('#origins-next-results-button').addClass('disabled');
   } else {
     $('#origins-next-results-button').removeClass('disabled');
   }
   if (offset > 0) {
     $('#origins-prev-results-button').removeClass('disabled');
   } else {
     $('#origins-prev-results-button').addClass('disabled');
   }
   inSearch = false;
   setTimeout(() => {
     window.scrollTo(0, 0);
   });
 }
 
 function searchOrigins(patterns, limit, searchOffset, offset) {
   originPatterns = patterns;
   let patternsArray = patterns.trim().replace(/\s+/g, ' ').split(' ');
   let patternsPermut = [];
   heapsPermute(patternsArray, p => patternsPermut.push(p.join('.*')));
   let regex = patternsPermut.join('|');
   let searchUrl = Urls.browse_origin_search(regex) + `?limit=${limit}&offset=${searchOffset}&regexp=true`;
 
   $('.swh-loading').addClass('show');
   fetch(searchUrl, {credentials: 'same-origin'})
     .then(handleFetchError)
     .then(response => response.json())
     .then(data => {
       currentData = data;
       if (typeof Storage !== 'undefined') {
         sessionStorage.setItem('last-swh-origin-url-patterns', patterns);
         sessionStorage.setItem('last-swh-origin-search-results', JSON.stringify(data));
         sessionStorage.setItem('last-swh-origin-search-offset', offset);
       }
       $('.swh-loading').removeClass('show');
       populateOriginSearchResultsTable(data, offset);
     })
     .catch(() => {
       $('.swh-loading').removeClass('show');
       inSearch = false;
     });
 }
 
 export function initOriginSearch() {
   $(document).ready(() => {
     if (typeof Storage !== 'undefined') {
       originPatterns = sessionStorage.getItem('last-swh-origin-url-patterns');
       let data = sessionStorage.getItem('last-swh-origin-search-results');
       offset = sessionStorage.getItem('last-swh-origin-search-offset');
       if (data) {
         $('#origins-url-patterns').val(originPatterns);
         offset = parseInt(offset);
         populateOriginSearchResultsTable(JSON.parse(data), offset);
       }
     }
 
     $('#search_origins').submit(event => {
       let patterns = $('#origins-url-patterns').val();
       offset = 0;
       inSearch = true;
+      clearOriginSearchResultsTable();
       searchOrigins(patterns, limit, offset, offset);
       event.preventDefault();
     });
 
     $('#origins-next-results-button').click(event => {
       if ($('#origins-next-results-button').hasClass('disabled') || inSearch) {
         return;
       }
       inSearch = true;
       offset += perPage;
       if (!currentData || offset % limit === 0) {
         searchOrigins(originPatterns, limit, offset, offset);
       } else {
         populateOriginSearchResultsTable(currentData, offset);
       }
       event.preventDefault();
     });
 
     $('#origins-prev-results-button').click(event => {
       if ($('#origins-prev-results-button').hasClass('disabled') || inSearch) {
         return;
       }
       inSearch = true;
       offset -= perPage;
       if (!currentData || (offset > 0 && (offset + perPage) % limit === 0)) {
         searchOrigins(originPatterns, limit, (offset + perPage) - limit, offset);
       } else {
         populateOriginSearchResultsTable(currentData, offset);
       }
       event.preventDefault();
     });
 
     $(document).on('shown.bs.tab', 'a[data-toggle="tab"]', e => {
       if (e.currentTarget.text.trim() === 'Search') {
         fixTableRowsStyle();
       }
     });
   });
 }
diff --git a/swh/web/static/img/swh-spinner-small.gif b/swh/web/static/img/swh-spinner-small.gif
new file mode 100644
index 00000000..0bf92074
Binary files /dev/null and b/swh/web/static/img/swh-spinner-small.gif differ
diff --git a/swh/web/templates/browse-search.html b/swh/web/templates/browse-search.html
index 0df50677..de715f6f 100644
--- a/swh/web/templates/browse-search.html
+++ b/swh/web/templates/browse-search.html
@@ -1,62 +1,62 @@
 {% extends "browse-layout.html" %}
 
 {% comment %}
 Copyright (C) 2017-2018  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load static %}
 
 {% block browse-content %}
 <div class="card">
   <div class="card-header bg-gray-light">
-    <h4>Search Software Heritage origins to browse</h4>
+    <div class="float-left">
+      <h4>Search Software Heritage origins to browse</h4>
+    </div>
+    <div class="swh-loading float-right">
+      <img src="{% static 'img/swh-spinner-small.gif' %}"></img>
+    </div>
   </div>
   <div class="card-body">
     <form class="form-horizontal" id="search_origins">
       <div class="input-group">
         <input class="form-control" placeholder="Enter string pattern(s) to search for in origin urls" type="text" id="origins-url-patterns"/>
         <div class="input-group-append">
           <button class="btn btn-default" type="submit"><i class="fa fa-search"></i></button>
         </div>
       </div>
     </form>
 
-    <div class="swh-loading">
-      <img src="{% static 'img/swh-spinner.gif' %}"></img>
-      <p>Searching origins ...</p>
-    </div>
-
     <div id="swh-origin-search-results" style="display: none;">
       <div class="table-responsive">
         <table class="table swh-table-even-odd" id="origin-search-results">
           <thead>
             <tr>
               <th>Origin type</th>
               <th>Origin browse url</th>
               <th>Visit status</th>
             </tr>
           </thead>
           <tbody></tbody>
         </table>
       </div>
     </div>
     <p id="swh-no-origins-found" style="display: none;">
       <br/>
       No origins matching the search criteria were found
     </p>
   </div>
 </div>
 
 <ul class="pagination justify-content-center">
   <li class="disabled page-item" id="origins-prev-results-button"><a class="page-link" tabindex="-1">Previous</a></li>
   <li class="disabled page-item" id="origins-next-results-button"><a class="page-link" tabindex="-1">Next</a></li>
 </ul>
 
 <script>
   swh.browse.initBrowse('search');
   swh.browse.initOriginSearch();
 </script>
 {% endblock %}
\ No newline at end of file