diff --git a/umap/static/umap/content.css b/umap/static/umap/content.css
index 64687adf..b1573b0c 100644
--- a/umap/static/umap/content.css
+++ b/umap/static/umap/content.css
@@ -16,6 +16,10 @@ input::-webkit-input-placeholder, ::-webkit-input-placeholder {
 input:-moz-placeholder, :-moz-placeholder {
    color: #a5a5a5;
 }
+.search-form {
+    display: flex;
+    align-items: baseline;
+}
 
 
 /* **************** */
diff --git a/umap/static/umap/css/bar.css b/umap/static/umap/css/bar.css
index 4dc36f6d..fe0410b6 100644
--- a/umap/static/umap/css/bar.css
+++ b/umap/static/umap/css/bar.css
@@ -203,6 +203,7 @@
     line-height: initial;
     height: initial;
     width: auto;
+    padding: 0 var(--text-margin);
 }
 .umap-caption-bar-enabled {
     --current-footer-height: var(--footer-height);
diff --git a/umap/static/umap/css/form.css b/umap/static/umap/css/form.css
index 65ae68e5..ae1b0c57 100644
--- a/umap/static/umap/css/form.css
+++ b/umap/static/umap/css/form.css
@@ -61,10 +61,7 @@ textarea {
 select {
     border: 1px solid #222;
     width: 100%;
-    height: 28px;
-    line-height: 28px;
-    margin-top: 5px;
-    margin-bottom: var(--box-margin);
+    padding: var(--button-padding);
 }
 .dark select {
     color: #efefef;
diff --git a/umap/templates/umap/search_bar.html b/umap/templates/umap/search_bar.html
index c3f22b0e..c4efe694 100644
--- a/umap/templates/umap/search_bar.html
+++ b/umap/templates/umap/search_bar.html
@@ -4,7 +4,7 @@
 {% trans "Search maps" as default_placeholder %}
 <div class="wrapper search_wrapper">
   <div class="row">
-    <form action="{% firstof action search_url %}" method="get">
+    <form class="search-form" action="{% firstof action search_url %}" method="get">
       <div class="col half mwide">
         <input name="q"
                type="search"