diff --git a/swh/web/assets/src/bundles/browse/origin-search.js b/swh/web/assets/src/bundles/browse/origin-search.js
index 2631a2b90..b9351043a 100644
--- a/swh/web/assets/src/bundles/browse/origin-search.js
+++ b/swh/web/assets/src/bundles/browse/origin-search.js
@@ -1,206 +1,218 @@
 /**
  * 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 = 20;
 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-result').hide();
     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.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)
         .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-result').text('No origins matching the search criteria were found.');
     $('#swh-no-result').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;
   if (typeof Storage !== 'undefined') {
     sessionStorage.setItem('last-swh-origin-search-offset', offset);
   }
   setTimeout(() => {
     window.scrollTo(0, 0);
   });
 }
 
 function escapeStringRegexp(str) {
   let matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
   return str.replace(matchOperatorsRe, '\\\\\\$&');
 }
 
 function searchOrigins(patterns, limit, searchOffset, offset) {
   originPatterns = patterns;
   let patternsArray = patterns.trim().replace(/\s+/g, ' ').split(' ');
   for (let i = 0; i < patternsArray.length; ++i) {
     patternsArray[i] = escapeStringRegexp(patternsArray[i]);
   }
   let patternsPermut = [];
   heapsPermute(patternsArray, p => patternsPermut.push(p.join('.*')));
   let regex = patternsPermut.join('|');
   let withVisit = $('#swh-search-origins-with-visit').prop('checked');
   let searchUrl = Urls.browse_origin_search(regex) + `?limit=${limit}&offset=${searchOffset}&regexp=true&with_visit=${withVisit}`;
 
   clearOriginSearchResultsTable();
   $('.swh-loading').addClass('show');
   fetch(searchUrl)
     .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);
         currentData = JSON.parse(data);
         populateOriginSearchResultsTable(currentData, offset);
       }
+      let withVisit = sessionStorage.getItem('last-swh-origin-with-visit');
+      if (withVisit !== null) {
+        $('#swh-search-origins-with-visit').prop('checked', JSON.parse(withVisit));
+      }
     }
 
     $('#search_origins').submit(event => {
       event.preventDefault();
       $('#swh-no-result').hide();
       let patterns = $('#origins-url-patterns').val();
       offset = 0;
       inSearch = true;
       // first try to resolve a swh persistent identifier
       let resolvePidUrl = Urls.resolve_swh_pid(patterns);
       fetch(resolvePidUrl)
         .then(handleFetchError)
         .then(response => response.json())
         .then(data => {
           // pid has been successfully resolved,
           // so redirect to browse page
           window.location = data.browse_url;
         })
         .catch(response => {
           // pid resolving failed
           if (patterns.startsWith('swh:')) {
             // display a useful error message if the input
             // looks like a swh pid
             response.json().then(data => {
               $('#swh-origin-search-results').hide();
               $('.swh-search-pagination').hide();
               $('#swh-no-result').text(data.reason);
               $('#swh-no-result').show();
             });
           } else {
             // otherwise, proceed with origins search
             $('#swh-origin-search-results').show();
             $('.swh-search-pagination').show();
             searchOrigins(patterns, limit, offset, offset);
           }
         });
     });
 
     $('#origins-next-results-button').click(event => {
       if ($('#origins-next-results-button').hasClass('disabled') || inSearch) {
         return;
       }
       inSearch = true;
       offset += perPage;
       if (!currentData || (offset >= limit && 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();
       }
     });
+
+    $(window).on('unload', () => {
+      if (typeof Storage !== 'undefined') {
+        sessionStorage.setItem('last-swh-origin-with-visit',
+          JSON.stringify($('#swh-search-origins-with-visit').prop('checked')));
+      }
+    });
+
   });
 }
diff --git a/swh/web/assets/src/bundles/webapp/webapp-utils.js b/swh/web/assets/src/bundles/webapp/webapp-utils.js
index 275c1ce82..61e669cca 100644
--- a/swh/web/assets/src/bundles/webapp/webapp-utils.js
+++ b/swh/web/assets/src/bundles/webapp/webapp-utils.js
@@ -1,82 +1,82 @@
 let collapseSidebar = false;
 let previousSidebarState = localStorage.getItem('swh-sidebar-collapsed');
 if (previousSidebarState !== undefined) {
   collapseSidebar = JSON.parse(previousSidebarState);
 }
 
 $(document).on('DOMContentLoaded', () => {
   // restore previous sidebar state (collapsed/expanded)
   if (collapseSidebar) {
     // hack to avoid animated transition for collasping sidebar
     // when loading a page
     let sidebarTransition = $('.main-sidebar, .main-sidebar:before').css('transition');
     let sidebarEltsTransition = $('.sidebar .nav-link p, .main-sidebar .brand-text, .sidebar .user-panel .info').css('transition');
     $('.main-sidebar, .main-sidebar:before').css('transition', 'none');
     $('.sidebar .nav-link p, .main-sidebar .brand-text, .sidebar .user-panel .info').css('transition', 'none');
     $('body').addClass('sidebar-collapse');
     $('.swh-words-logo-swh').css('visibility', 'visible');
     // restore transitions for user navigation
     setTimeout(() => {
       $('.main-sidebar, .main-sidebar:before').css('transition', sidebarTransition);
       $('.sidebar .nav-link p, .main-sidebar .brand-text, .sidebar .user-panel .info').css('transition', sidebarEltsTransition);
     });
   }
 });
 
 $(document).on('collapsed.lte.pushmenu', event => {
   if ($('body').width() > 980) {
     $('.swh-words-logo-swh').css('visibility', 'visible');
   }
 });
 
 $(document).on('shown.lte.pushmenu', event => {
   $('.swh-words-logo-swh').css('visibility', 'hidden');
 });
 
 function ensureNoFooterOverflow() {
   $('body').css('padding-bottom', $('footer').outerHeight() + 'px');
 }
 
 $(document).ready(() => {
   // redirect to last browse page if any when clicking on the 'Browse' entry
   // in the sidebar
   $(`.swh-browse-link`).click(event => {
     let lastBrowsePage = sessionStorage.getItem('last-browse-page');
     if (lastBrowsePage) {
       event.preventDefault();
       window.location = lastBrowsePage;
     }
   });
 
   // ensure footer do not overflow main content for mobile devices
   // or after resizing the browser window
   ensureNoFooterOverflow();
   $(window).resize(function() {
     ensureNoFooterOverflow();
     if ($('body').hasClass('sidebar-collapse') && $('body').width() > 980) {
       $('.swh-words-logo-swh').css('visibility', 'visible');
     }
   });
 
 });
 
 export function initPage(page) {
 
   $(document).ready(() => {
     // set relevant sidebar link to page active
     $(`.swh-${page}-item`).addClass('active');
     $(`.swh-${page}-link`).addClass('active');
 
     // triggered when unloading the current page
-    window.onunload = () => {
+    $(window).on('unload', () => {
       // backup sidebar state (collapsed/expanded)
       let sidebarCollapsed = $('body').hasClass('sidebar-collapse');
       localStorage.setItem('swh-sidebar-collapsed', JSON.stringify(sidebarCollapsed));
       // backup current browse page
       if (page === 'browse') {
         sessionStorage.setItem('last-browse-page', window.location);
       }
-    };
+    });
 
   });
 }