auto import from //depot/cupcake/@137055
diff --git a/tools/droiddoc/templates/assets/search_autocomplete.js b/tools/droiddoc/templates/assets/search_autocomplete.js
index c9b6ff6..2e12e0f 100644
--- a/tools/droiddoc/templates/assets/search_autocomplete.js
+++ b/tools/droiddoc/templates/assets/search_autocomplete.js
@@ -107,7 +107,8 @@
     var text = search.value;
 
     // 13 = enter
-    if (kd && (e.keyCode == 13)) {
+    if (!kd && (e.keyCode == 13)) {
+        document.getElementById("search_filtered_div").className = "no-display";
         if (gSelectedIndex >= 0) {
             window.location = toroot + gMatches[gSelectedIndex].link;
             return false;
@@ -145,6 +146,7 @@
             }
         }
         sync_selection_table(toroot);
+        return true; // allow the event to bubble up to the search api
     }
 }