diff --git a/htroot/env/templates/simpleheader.template b/htroot/env/templates/simpleheader.template
index 9d060a6e3..eb4d42d4c 100644
--- a/htroot/env/templates/simpleheader.template
+++ b/htroot/env/templates/simpleheader.template
@@ -1,7 +1,7 @@
 <div class="SubMenu">
 <ul class="SubMenu">
 <li style="width:16%;"><a href="/Status.html?login=true" class="MenuItemLink">Peer Administration</a></li>
-<li style="width:16%;"><a href="/index.html" class="MenuItemLink">Web Search</a></li>
+<li style="width:16%;"><a href="/index.html" onclick="this.href='/index.html?handover='+document.searchform.search.value" class="MenuItemLink">Web Search</a></li>
 <li style="width:16%;"><a href="/Surftips.html" class="MenuItemLink">Surftips</a></li>
 <li style="width:16%;"><a href="/ViewProfile.html?hash=localhash" class="MenuItemLink">Peer Owner Profile</a></li>
 <li style="width:16%;"><a href="http://www.yacy-websearch.net/wiki/" class="MenuItemLink">Help / Wiki</a></li>
diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html
index d97d72cd6..d9d314abc 100644
--- a/htroot/yacysearch.html
+++ b/htroot/yacysearch.html
@@ -10,7 +10,7 @@
  <script type="text/javascript" src="/js/yacysearch.js"></script>
    
 </head>
-<body id="yacysearch">
+<body id="yacysearch" onload="document.getElementById('search').focus()">
 
 #(display)#
 #%env/templates/simpleheader.template%#
