diff --git a/src/templates/css/docs.css b/src/templates/css/docs.css
index afea2d3..ea78afa 100644
--- a/src/templates/css/docs.css
+++ b/src/templates/css/docs.css
@@ -116,6 +116,10 @@ img.AngularJS-small {
   line-height: 14px;
 }
 
+.form-search .well li a:focus {
+	outline: none;
+}
+
 .form-search .well .guide {
   float: right;
   padding-top: 0;
@@ -126,6 +130,10 @@ img.AngularJS-small {
   line-height: 20px;
 }
 
+.match > a, .nav > .match > a:hover {
+	background-color: #dbeaf4;
+}
+
 /* =============================== */
 /*            Content              */
 /* =============================== */
diff --git a/src/templates/js/docs.js b/src/templates/js/docs.js
index 2f1ecea..892a170 100644
--- a/src/templates/js/docs.js
+++ b/src/templates/js/docs.js
@@ -297,7 +297,10 @@ docsApp.controller.DocsController = function($scope, $location, $window, section
     return {
       first: this.$first,
       last: this.$last,
-      active: page1 && this.currentPage == page1 || page2 && this.currentPage == page2
+      active: page1 && this.currentPage == page1 || page2 && this.currentPage == page2,
+      match: this.focused && this.currentPage != page1 &&
+             this.bestMatch.rank > 0 && this.bestMatch.page == page1
+             
     };
   };