diff --git a/templates/navigation.hbs b/templates/navigation.hbs
index bf68eb15d..d68bc11c9 100644
--- a/templates/navigation.hbs
+++ b/templates/navigation.hbs
@@ -3,10 +3,7 @@
         <div class="pure-menu pure-menu-horizontal" role="navigation" aria-label="Main navigation">
           <form action="/releases/search" method="GET" class="landing-search-form-nav">
             {{#unless varsb.show_search_form}}
-            <div class="search-input-nav">
-              <label for="nav-search"><i class="fa fa-fw fa-search"></i></label>
-              <input id="nav-search" name="query" type="text" aria-label="Find crate by search query" placeholder="Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
-            </div>
+            <input class="search-input-nav" name="query" type="text" aria-label="Find crate by search query" placeholder="Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
             {{/unless}}
           <a href="/" class="pure-menu-heading pure-menu-link" aria-label="Docs.rs"><i class="fa fa-cubes fa-fw"></i> Docs.rs</a>
           <ul class="pure-menu-list">
diff --git a/templates/navigation_rustdoc.hbs b/templates/navigation_rustdoc.hbs
index 262f041c2..7eecfdd54 100644
--- a/templates/navigation_rustdoc.hbs
+++ b/templates/navigation_rustdoc.hbs
@@ -3,10 +3,7 @@
         <div class="pure-menu pure-menu-horizontal">
           <form action="/releases/search" method="GET" class="landing-search-form-nav">
             {{#unless varsb.show_search_form}}
-            <div class="search-input-nav">
-              <label for="nav-search"><i class="fa fa-fw fa-search"></i></label>
-              <input id="nav-search" name="query" type="text" aria-label="Find crate by search query" placeholder="Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
-            </div>
+            <input class="search-input-nav" name="query" aria-label="Find crate by search query" tabindex="-1" type="text" placeholder="Find crate"{{#if varss.search_query}} value="{{varss.search_query}}"{{/if}}>
             {{/unless}}
             <a href="/" class="pure-menu-heading pure-menu-link"><i class="fa fa-cubes fa-fw"></i><span class="title"> Docs.rs</span></a>
           {{#with content.crate_details}}
diff --git a/templates/style.scss b/templates/style.scss
index 96a84e5d2..491caf4fc 100644
--- a/templates/style.scss
+++ b/templates/style.scss
@@ -173,37 +173,22 @@ div.nav-container {
     form.landing-search-form-nav {
         max-width: 1200px;
 
-        div.search-input-nav {
+        input.search-input-nav {
             float: right;
-            max-width: 150px;
+            max-width: 200px;
+            border: none;
+            margin: 0 1em 0 0;
+            font-size: 0.8em;
+            text-align: right;
+            box-shadow: none;
+            background-color: #fff;
+            height: 31px;
             display: none;
-            border-left: 1px solid $color-border;
 
             @media #{$media-sm} {
                 display: block;
             }
-
-            @media #{$media-md} {
-                max-width: 200px;
-            }
-
-            label {
-                color: #777;
-                cursor: pointer;
-                padding-left: 0.5rem;
-                font-size: 0.8em;
-            }
-
-            input {
-                border: none;
-                margin: 0 1em 0 0;
-                font-size: 0.8em;
-                box-shadow: none;
-                background-color: #fff;
-                height: 31px;
-            }
         }
-        
 
         input.search-input-nav:focus {
             outline: unset;