diff --git a/renderer.py b/renderer.py
index 5744388..fbbe44c 100644
--- a/renderer.py
+++ b/renderer.py
@@ -583,18 +583,20 @@ def oidc_nav_mobile(user_name, email_address, name):
 
 def render_search():
     html_payload = """
-        <li class="hide-on-medium-and-down">    
+        <li class="hide-on-medium-and-down">
+        <a href="#">
             <form id="navbarsearch">
                 <div class="navfix">
                     <div id="navfix2">
                         <div class="input-field">
                             <input id="search" type="search" required>
-                            <label class="label-icon" for="search"><a href="#"><i class="material-icons">search</i></a></label>
+                            <label class="label-icon" for="search"><i class="material-icons">search</i></label>
                             <i class="material-icons">close</i>
                         </div>
                     </div>
                 </div>
             </form>
+        </a>
         </li>
     """
     return Markup(html_payload)
diff --git a/static/js/custom.js b/static/js/custom.js
index 4410f2d..376d929 100644
--- a/static/js/custom.js
+++ b/static/js/custom.js
@@ -11,7 +11,7 @@ $(document).ready(function() {
         $('.search-hide').addClass('hide');
        if (trig == 1){
           $('#navfix2').animate({
-            width: '+=210',
+            width: '100%',
             marginRight: 0
           }, 200);
           
@@ -22,7 +22,7 @@ $(document).ready(function() {
       // if user leaves the form the width will go back to original state
       $("#search").focusout(function() {
           $('#navfix2').animate({
-          width: '-=210'
+          width: '64'
         }, 200);
        trig = trig - 1;
         //handle other nav elements visibility first to avoid push down