diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css
index acb873d..eb7e107 100644
--- a/tools/droiddoc/templates/assets/android-developer-core.css
+++ b/tools/droiddoc/templates/assets/android-developer-core.css
@@ -81,6 +81,7 @@
   padding:10px;
   margin:0 0 1em 1em;
   overflow:auto;
+  line-height:inherit; /* fixes vertical scrolling in webkit */
 }
 
 h1,h2,h3,h4,h5 {
diff --git a/tools/droiddoc/templates/assets/search_autocomplete.js b/tools/droiddoc/templates/assets/search_autocomplete.js
index 929751f..f2e6f5c 100644
--- a/tools/droiddoc/templates/assets/search_autocomplete.js
+++ b/tools/droiddoc/templates/assets/search_autocomplete.js
@@ -168,6 +168,6 @@
 
 function submit_search() {
   var query = document.getElementById('search_autocomplete').value;
-  document.location = toRoot + 'search.html#q=' + query; // toRoot is initialized in android-developer-docs.js 
+  document.location = '/search.html#q=' + query + '&t=0';
   return false;
 }