diff --git a/app/assets/stylesheets/orgas.sass b/app/assets/stylesheets/orgas.sass
index a7a5b3a47be3b0f9674c9f156f62bcf654b32560..ba2eb143684d849ee3d25ea670b353e658205b14 100644
--- a/app/assets/stylesheets/orgas.sass
+++ b/app/assets/stylesheets/orgas.sass
@@ -4,9 +4,7 @@ img.favicon
   vertical-align: middle
 
 form#orga_search
-  font-size: larger
-  margin-top: 0.2em
-  margin-bottom: 1em
+  display: inline
   label
     display: none
   em.fa
@@ -15,8 +13,8 @@ form#orga_search
     width: 14em
     border: solid thin #258
     padding: 0
-    margin-left: -1.7em
-    margin-right: -1.3em
+    margin-left: -1.8em
+    margin-right: -1.6em
     padding-left: 1.5em
     padding-right: 1.2em
     border-radius: 0.4em
@@ -28,6 +26,7 @@ form#orga_search
     box-shadow: none
     margin-top: -0.1em
     margin-left: 0
+    margin-right: 1em
     vertical-align: middle
     background-color: transparent
     &:hover em.fa
diff --git a/app/assets/stylesheets/pages.sass b/app/assets/stylesheets/pages.sass
index 66c103915bd137b140ffaff439dbe2c7086d2292..95a84e83657b005fa67d318f591f5aaca3de611e 100644
--- a/app/assets/stylesheets/pages.sass
+++ b/app/assets/stylesheets/pages.sass
@@ -4,4 +4,3 @@ body.pages main
 
 .digest
   float: right
-  font-size: smaller
diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml
index 9875c1931eae3cf8e064b73f883ee57823f8a5ed..b1de59a331322520e6ea2173137aae36d419c865 100644
--- a/app/views/events/index.html.haml
+++ b/app/views/events/index.html.haml
@@ -53,6 +53,4 @@
 /%a#banner(href='https://www.libre-en-fete.net')
 /  = image_tag 'lef.png', width: '486', height: '80', alt: 'Libre en Fete'
 
-= render '/orgas/search'
-
 - events_meta
diff --git a/app/views/pages/_search.haml b/app/views/pages/_search.haml
index be9bdb6016ed66c74a2e0c75b48c683b5ac709f5..e4377fb5c90f6c4a612b1f984e8bc6b9b6c84ee1 100644
--- a/app/views/pages/_search.haml
+++ b/app/views/pages/_search.haml
@@ -2,9 +2,12 @@
   .digest
     - if params[:tag].present?
       = render partial: '/tags/context', locals: { tags: params[:tag] }
+    - else
+      = render '/orgas/search'
 
-    = link_to page_path('filter'), class: 'filter' do
-      = t 'title', scope: 'pages.filter'
+    - if params[:tag].blank? && (params[:near].blank? || params[:near][:location].blank?)
+      = link_to page_path('filter'), class: 'filter' do
+        = t 'title', scope: 'pages.filter'
 
     = link_to page_path('filter'), title: t('title', scope: 'pages.filter') do
       %em.fa.fa-angle-double-right