diff --git a/web/themes/custom/geofresco/src/templates/layout/page.html.twig b/web/themes/custom/geofresco/src/templates/layout/page.html.twig
index decf780..728ecbb 100644
--- a/web/themes/custom/geofresco/src/templates/layout/page.html.twig
+++ b/web/themes/custom/geofresco/src/templates/layout/page.html.twig
@@ -17,11 +17,19 @@
 {% endif %}
 {% block navbar %}
 {# Add a new region #}
-{% if page.header_user %}
+{% if page.header_user or page.header_search %}
 <div class="container">
   <div class="columns">
-    <div class="column"></div>
+  {% if page.header_user %}
+    <div class="column">
     {{ page.header_user }}
+    </div>
+  {% endif %}
+  {% if page.header_search %}
+    <div class="column is-narrow">
+      {{ page.header_search }}
+    </div>
+  {% endif %}
   </div>
 </div>
 {% endif %}
@@ -30,8 +38,8 @@
 {% block header %}
 <section class="hero">
   {% block header_and_search %}
-  {% if page.header or page.header_search %}
-  {# Header hero region + search #}
+  {% if page.header %}
+  {# Header hero region #}
   <div class="hero-body">
     <div class="container">
       <div class="columns is-vcentered">
@@ -39,9 +47,6 @@
           {{ page.header }}
           <h1 class="title">{{ site_slogan }}</h1>
         </div>
-        <div class="column is-narrow">
-          {{ page.header_search }}
-        </div>
       </div>
     </div>
   </div>