diff --git a/core/src/main/java/hudson/search/CollectionSearchIndex.java b/core/src/main/java/hudson/search/CollectionSearchIndex.java
index 51c5ee45be8f61b6fa0ca857e53efd77baa5cc0b..341bdad6bd0b2079420b2e72b35b7037cabac834 100644
--- a/core/src/main/java/hudson/search/CollectionSearchIndex.java
+++ b/core/src/main/java/hudson/search/CollectionSearchIndex.java
@@ -54,7 +54,7 @@ public abstract class CollectionSearchIndex<SMT extends SearchableModelObject> i
         Collection<SMT> items = all();
         if(items==null)     return;
         for (SMT o : items) {
-            if(o!=null && getName(o).contains(token))
+            if(o!=null && getName(o).toLowerCase().contains(token.toLowerCase()))
                 result.add(o);
         }
     }
diff --git a/core/src/main/java/hudson/search/FixedSet.java b/core/src/main/java/hudson/search/FixedSet.java
index 7f2919c18910e6f421d20c504ce3d25bca34d674..d0a6efe82c2298f2e57fa1e51de8a8468df870e4 100644
--- a/core/src/main/java/hudson/search/FixedSet.java
+++ b/core/src/main/java/hudson/search/FixedSet.java
@@ -45,13 +45,13 @@ public class FixedSet implements SearchIndex {
 
     public void find(String token, List<SearchItem> result) {
         for (SearchItem i : items)
-            if(token.equals(i.getSearchName()))
+            if(token.toLowerCase().equals(i.getSearchName().toLowerCase()))
                 result.add(i);
     }
 
     public void suggest(String token, List<SearchItem> result) {
         for (SearchItem i : items)
-            if(i.getSearchName().contains(token))
+            if(i.getSearchName().toLowerCase().contains(token.toLowerCase()))
                 result.add(i);
     }
 }
diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
index 03603e9038ccc5f7e50db918209f6b724dd86aa4..e2e643ddcf65e142ed5fc81f1b298470427f7f82 100644
--- a/war/src/main/webapp/scripts/hudson-behavior.js
+++ b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -1917,6 +1917,7 @@ function createSearchBox(searchURL) {
     };
     var ac = new YAHOO.widget.AutoComplete("search-box","search-box-completion",ds);
     ac.typeAhead = false;
+    ac.autoHighlight = false;
 
     var box   = $("search-box");
     var sizer = $("search-box-sizer");