@@ -48,10 +48,8 @@ <h3>{{ _('Navigation') }}</h3>
     {%- if builder != "htmlhelp" %}
     <div class="inline-search" role="search">
         <form class="inline-search" action="{{ pathto('search') }}" method="get">
-          <input placeholder="{{ _('Quick search') }}" aria-label="{{ _('Quick search') }}" type="text" name="q" />
+          <input placeholder="{{ _('Quick search') }}" aria-label="{{ _('Quick search') }}" type="search" name="q" />
           <input type="submit" value="{{ _('Go') }}" />
-          <input type="hidden" name="check_keywords" value="yes" />
-          <input type="hidden" name="area" value="default" />
         </form>
     </div>
     {%- endif %}
@@ -109,9 +107,8 @@ <h3>{{ _('Navigation') }}</h3>
                 <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" class="search-icon">
                     <path fill-rule="nonzero" fill="currentColor" d="M15.5 14h-.79l-.28-.27a6.5 6.5 0 001.48-5.34c-.47-2.78-2.79-5-5.59-5.34a6.505 6.505 0 00-7.27 7.27c.34 2.8 2.56 5.12 5.34 5.59a6.5 6.5 0 005.34-1.48l.27.28v.79l4.25 4.25c.41.41 1.08.41 1.49 0 .41-.41.41-1.08 0-1.49L15.5 14zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path>
                 </svg>
-                <input type="search" name="q" aria-label="{{ _('Quick search') }}"/>
+                <input placeholder="{{ _('Quick search') }}" aria-label="{{ _('Quick search') }}" type="search" name="q" />
                 <input type="submit" value="{{ _('Go') }}"/>
-                {# TODO missing hidden inputs #}
             </form>
             {%- endif %}
         </span>
 
@@ -357,6 +357,7 @@ dl > dt span ~ em {
     .nav-content .search input[type=search] {
         border: 0;
         padding-left: 24px;
+        width: 100%;
         flex: 1;
     }
     .nav-content .search input[type=submit] {
Original file line number	Diff line number	Diff line change
@@ -357,6 +357,7 @@ dl > dt span ~ em {
357	357	.nav-content .search input[type=search] {
358	358	border: 0;
359	359	padding-left: 24px;
	360	+ width: 100%;
360	361	flex: 1;
361	362	}
362	363	.nav-content .search input[type=submit] {