diff --git a/app/assets/javascripts/autocomplete.js.erb b/app/assets/javascripts/autocomplete.js.erb
index c09a4119a..159dea0ef 100644
--- a/app/assets/javascripts/autocomplete.js.erb
+++ b/app/assets/javascripts/autocomplete.js.erb
@@ -344,7 +344,7 @@
       return;
     }
 
-    if ($autocomplete_menu.has(".ui-state-focus").length === 0) {
+    if ($autocomplete_menu.has(".ui-state-active").length === 0) {
       var $first_item = $autocomplete_menu.find(".ui-menu-item").first();
       var completion = $first_item.data().uiAutocompleteItem.value;
 
@@ -358,6 +358,7 @@
 
   Danbooru.Autocomplete.render_item = function(list, item) {
     var $link = $("<a/>");
+    var $menu_item = $("<div/>").append($link);
 
     if (item.antecedent) {
       var antecedent = item.antecedent.replace(/_/g, " ");
@@ -396,7 +397,7 @@
       $link.addClass("pool-category-" + item.category);
     }
 
-    return $("<li/>").data("item.autocomplete", item).append($link).appendTo(list);
+    return $("<li/>").data("item.autocomplete", item).append($menu_item).appendTo(list);
   };
 
   Danbooru.Autocomplete.static_metatags = {
diff --git a/app/assets/stylesheets/common/autocomplete.scss b/app/assets/stylesheets/common/autocomplete.scss
index 8fef7e117..128d5ccfa 100644
--- a/app/assets/stylesheets/common/autocomplete.scss
+++ b/app/assets/stylesheets/common/autocomplete.scss
@@ -1,6 +1,13 @@
 .ui-autocomplete {
   font-size: 0.9em;
-  z-index: 1000;
+
+  .ui-state-active {
+    border: none;
+    margin: 0 -1px;
+    background-color: #F0F0F0;
+    border-left: 1px solid #C5C5C5;
+    border-right: 1px solid #C5C5C5;
+  }
 
   .ui-menu-item a {
     padding: 1px .2em;
@@ -9,4 +16,4 @@
   .autocomplete-arrow {
     color: black;
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/common/erb/tags.scss.erb b/app/assets/stylesheets/common/erb/tags.scss.erb
index 1ca6d51ca..2dd215c2c 100644
--- a/app/assets/stylesheets/common/erb/tags.scss.erb
+++ b/app/assets/stylesheets/common/erb/tags.scss.erb
@@ -1,5 +1,5 @@
 <% TagCategory.css_mapping.each do |category,cssmap| %>
-  .category-<%= category %> a, a.tag-type-<%= category %>, .ui-state-focus a.tag-type-<%= category %> {
+  .category-<%= category %> a, a.tag-type-<%= category %>, .ui-state-active a.tag-type-<%= category %> {
     color: <%= cssmap["color"] %>;
 
     &:hover {
@@ -8,7 +8,7 @@
   }
 <% end %>
 
-.category-banned a, a.tag-type-banned, .ui-state-focus a.tag-type-banned {
+.category-banned a, a.tag-type-banned, .ui-state-active a.tag-type-banned {
   color: black;
   background-color: red;
 }
diff --git a/app/assets/stylesheets/common/jquery_ui_custom.scss b/app/assets/stylesheets/common/jquery_ui_custom.scss
index 05367f3ca..52000b320 100644
--- a/app/assets/stylesheets/common/jquery_ui_custom.scss
+++ b/app/assets/stylesheets/common/jquery_ui_custom.scss
@@ -57,3 +57,7 @@ div.ui-dialog {
     background: linear-gradient(#fefefe, #f0f0f0);
   }
 }
+
+.ui-front {
+  z-index: 1000;
+}