diff --git a/cypress/integration/home.spec.js b/cypress/integration/home.spec.js
--- a/cypress/integration/home.spec.js
+++ b/cypress/integration/home.spec.js
@@ -56,4 +56,20 @@
         }
       });
   });
+
+  it('should redirect to search page when submitting search form', function() {
+    const searchText = 'git';
+    cy.get('#origins-url-patterns')
+      .type(searchText)
+      .get('.swh-search-icon')
+      .click();
+
+    cy.location('pathname')
+      .should('equal', this.Urls.browse_search());
+
+    cy.location('search')
+      .should('equal', `?q=${searchText}&with_visit=true&with_content=true`);
+
+  });
+
 });
diff --git a/swh/web/assets/src/bundles/browse/origin-search.js b/swh/web/assets/src/bundles/browse/origin-search.js
--- a/swh/web/assets/src/bundles/browse/origin-search.js
+++ b/swh/web/assets/src/bundles/browse/origin-search.js
@@ -191,7 +191,7 @@
         queryParameters.append('search_metadata', searchMetadata);
       }
       // Update the url, triggering page reload and effective search
-      window.location.search = `?${queryParameters.toString()}`;
+      window.location = `${Urls.browse_search()}?${queryParameters.toString()}`;
     });
 
     $('#origins-next-results-button').click(event => {
diff --git a/swh/web/templates/browse/search.html b/swh/web/templates/browse/search.html
--- a/swh/web/templates/browse/search.html
+++ b/swh/web/templates/browse/search.html
@@ -15,35 +15,7 @@
 
 {% block browse-content %}
 
-<form class="form-horizontal" id="swh-search-origins">
-  <div class="input-group">
-    <input class="form-control" placeholder="Enter a persistent id to resolve or string pattern(s) to search for in origin urls" type="text" id="origins-url-patterns"/>
-    <div class="input-group-append">
-      <button class="btn btn-primary" type="submit"><i class="swh-search-icon mdi mdi-24px mdi-magnify" aria-hidden="true"></i></button>
-    </div>
-  </div>
-  <div class="custom-control custom-checkbox swh-id-option">
-    <input class="custom-control-input" value="option-origins-with-visit" type="checkbox"
-          id="swh-search-origins-with-visit" checked>
-    <label class="custom-control-label font-weight-normal" for="swh-search-origins-with-visit">
-      only show origins visited at least once
-    </label>
-  </div>
-  <div class="custom-control custom-checkbox swh-id-option">
-    <input class="custom-control-input" value="option-filter-empty-visits" type="checkbox"
-          id="swh-filter-empty-visits" checked>
-    <label class="custom-control-label font-weight-normal" for="swh-filter-empty-visits">
-      filter out origins with no archived content
-    </label>
-  </div>
-  <div class="custom-control custom-checkbox swh-id-option">
-    <input class="custom-control-input" value="option-filter-empty-visits" type="checkbox"
-          id="swh-search-origin-metadata">
-    <label class="custom-control-label font-weight-normal" for="swh-search-origin-metadata">
-      search in metadata (instead of URL)
-    </label>
-  </div>
-</form>
+{% include "includes/origin-search-form.html" %}
 <hr>
 <div id="swh-origin-search-results" class="mb-3" style="display: none;">
   <div class="table-responsive">
@@ -76,6 +48,5 @@
 
 <script>
   swh.webapp.initPage('search');
-  swh.browse.initOriginSearch();
 </script>
 {% endblock %}
diff --git a/swh/web/templates/homepage.html b/swh/web/templates/homepage.html
--- a/swh/web/templates/homepage.html
+++ b/swh/web/templates/homepage.html
@@ -8,6 +8,11 @@
 {% endcomment %}
 
 {% load static %}
+{% load render_bundle from webpack_loader %}
+
+{% block header %}
+{% render_bundle 'browse' %}
+{% endblock %}
 
 {% block title %}Welcome to the Software Heritage archive{% endblock %}
 
@@ -19,6 +24,10 @@
 
 {% block content %}
 
+<h4>Search</h4>
+
+{% include "includes/origin-search-form.html" %}
+
 <h4>Overview</h4>
 
 <p>
diff --git a/swh/web/templates/browse/search.html b/swh/web/templates/includes/origin-search-form.html
copy from swh/web/templates/browse/search.html
copy to swh/web/templates/includes/origin-search-form.html
--- a/swh/web/templates/browse/search.html
+++ b/swh/web/templates/includes/origin-search-form.html
@@ -1,20 +1,10 @@
-{% extends "./layout.html" %}
-
 {% comment %}
-Copyright (C) 2017-2019  The Software Heritage developers
+Copyright (C) 2020  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 navbar-content %}
-<h4>Search archived software</h4>
-{% endblock %}
-
-{% block browse-content %}
-
 <form class="form-horizontal" id="swh-search-origins">
   <div class="input-group">
     <input class="form-control" placeholder="Enter a persistent id to resolve or string pattern(s) to search for in origin urls" type="text" id="origins-url-patterns"/>
@@ -44,38 +34,7 @@
     </label>
   </div>
 </form>
-<hr>
-<div id="swh-origin-search-results" class="mb-3" style="display: none;">
-  <div class="table-responsive">
-    <table class="table swh-table swh-table-striped" id="origin-search-results">
-      <thead>
-        <tr>
-          <th>Origin url</th>
-          <th>Visit type</th>
-          <th>Visit status</th>
-        </tr>
-      </thead>
-      <tbody>
-      </tbody>
-    </table>
-  </div>
-</div>
-<div class="swh-loading">
-  <img src="{% static 'img/swh-spinner.gif' %}"></img>
-  <p>Searching origins ...</p>
-</div>
-<p id="swh-no-result" style="display: none; white-space: pre;">
-  <br/>
-  No origins matching the search criteria were found.
-</p>
-
-<ul class="pagination justify-content-center swh-search-pagination">
-  <li class="disabled page-item" id="origins-prev-results-button"><a class="page-link" href="#" tabindex="-1">Previous</a></li>
-  <li class="disabled page-item" id="origins-next-results-button"><a class="page-link" href="#" tabindex="-1">Next</a></li>
-</ul>
 
 <script>
-  swh.webapp.initPage('search');
   swh.browse.initOriginSearch();
 </script>
-{% endblock %}