diff --git a/APPL/FAC/header.inc b/APPL/FAC/header.inc
index f4950d2895..228b9a41c7 100644
--- a/APPL/FAC/header.inc
+++ b/APPL/FAC/header.inc
@@ -121,9 +121,9 @@ function generateHeader()
     var authparams = user.checkAutorisation("WEB_PHSRCH", true);
     if (S("show_header_productsearch") || (authparams && authparams.PRSreadlevel < 9))
     {
-      Response.Write("<div class=\"headerToggle\" onClick=\"toggleHeaderSearch()\""
-                    + " style='position: absolute; right: 348px'><i class=\"fa fa-2x fa-search fa-fw\"></i><br>"
-                    + "<i class=\"fa fa-arrow-left\" aria-hidden=\"true\"></i><i class=\"fa fa-arrow-right\" aria-hidden=\"true\"></i></div>");
+      Response.Write("<div class='headerToggle' onclick='toggleHeaderSearch()' title='"+L("lcl_search")+"'>"
+                    + "<i class='fa fa-search fa-fw'></i><i class='fa fa-fw fa-arrow-right'></i>"
+                    + "</div>");
     }
     %><div id="headersuggest"><%
       // Suggest om een persoon te vinden. Gebruikt de scope van de telefoongids
@@ -165,17 +165,16 @@ function generateHeaderFunctions (params)
     {
         var duration = 400;
         var setWidth, setRigth, setVis;
-        var show = $(".headerToggle .fa-arrow-left").is(":visible");
+        var show = $(".headerToggle .fa-search").is(":visible");
         if (show)
         {
             setWidth = "340px";
             setRight = "350px";
             setVis = "visible";
             $("#headersuggest .fldpers").css("visibility", setVis);
-            $("#headersearch .fldsrch").css("visibility", setVis);
+            $("#headersearch .fldsrch").css("visibility", setVis).focus();
             $("#headersuggest .suggestklikker").css("visibility", setVis);
             $("#headersearch .productklikker").css("visibility", setVis);
-            $(".headerToggle .fa-arrow-left").toggle();
             $(".headerToggle .fa-arrow-right").toggle();
             $(".headerToggle .fa-search").toggle();
         }
@@ -196,7 +195,6 @@ function generateHeaderFunctions (params)
                 $("#headersearch .fldsrch").css("visibility", setVis);
                 $("#headersuggest .suggestklikker").css("visibility", setVis);
                 $("#headersearch .productklikker").css("visibility", setVis);
-                $(".headerToggle .fa-arrow-left").toggle();
                 $(".headerToggle .fa-arrow-right").toggle();
                 $(".headerToggle .fa-search").toggle();
             }
@@ -260,7 +258,11 @@ function generateHeaderFunctions (params)
         $("#headersearch .fldsrch").css("visibility", "hidden");
         $(".headerToggle").css("right", "0px");
         $(".headerToggle .fa-arrow-right").toggle();
+        $("#headersearch .productklikker").on('click', function() {
+            $("form#p").trigger("submit");
+        });
     });
+
   </script>
   <div id="headerfunctions">
     <div id="loggedinuser"><%=L("lcl_loggedin_as") + '<span onclick="myInfo()">'+ safe.html(user.naam())+ (user.alg_locatie_key({withcurrent:true})>-1 ? I("fa-map-marker")+(new Locatie(user.alg_locatie_key({withcurrent:true})).locatie_string()) : "") +'</span>' %></div>
diff --git a/APPL/Shared/productsearch.inc b/APPL/Shared/productsearch.inc
index 9569fe9eda..844bae25f6 100644
--- a/APPL/Shared/productsearch.inc
+++ b/APPL/Shared/productsearch.inc
@@ -27,7 +27,8 @@ function FCLTproductsearch (params)
       };
 
     function dosearch () {
-         FcltMgr.openDetail("appl/fac/prodsearch.asp?s="+myEncode($('#productsearch').val()), "<%=L("lcl_search_result")%> "+$('#productsearch')[0].value);
+        if (toggleHeaderSearch) toggleHeaderSearch();
+        FcltMgr.openDetail("appl/fac/prodsearch.asp?s="+myEncode($('#productsearch').val()), "<%=L("lcl_search_result")%> "+$('#productsearch')[0].value);
     }
 </script>
 <%