diff --git a/Changelog.md b/Changelog.md
index 911f05ace..f2a80333e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -34,7 +34,7 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
 * Replace jquery.autoresize with autosize [#6104](https://github.com/diaspora/diaspora/pull/6104)
 * Improve mobile conversation design [#6087](https://github.com/diaspora/diaspora/pull/6087)
 * Replace remaining faceboxes with Bootstrap modals [#6106](https://github.com/diaspora/diaspora/pull/6106)
-* Rewrite header using Bootstrap 3 [#6109](https://github.com/diaspora/diaspora/pull/6109)
+* Rewrite header using Bootstrap 3 [#6109](https://github.com/diaspora/diaspora/pull/6109) [#6130](https://github.com/diaspora/diaspora/pull/6130)
 
 ## Bug fixes
 * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
diff --git a/app/assets/stylesheets/autocomplete.scss b/app/assets/stylesheets/autocomplete.scss
index 5fa51c6c4..d5c0726f1 100644
--- a/app/assets/stylesheets/autocomplete.scss
+++ b/app/assets/stylesheets/autocomplete.scss
@@ -19,6 +19,7 @@
 }
 
 .ac_results li {
+  color: white;
   margin: 0px;
   padding: 2px 5px {
     left: 50px;
@@ -47,16 +48,15 @@
 }
 
 .ac_odd {
-  background-color: #fafafa;
+  background-color: $navbar-inverse-bg;
 }
 
 .ac_even {
-  background-color: #fff;
+  background-color: darken($navbar-inverse-bg, 3%);
 }
 
 .ac_over {
-  background-color: #3F8FBA;
-  color: white;
+  background-color: $brand-primary;
 }
 
 .ac_results {
diff --git a/vendor/assets/javascripts/jquery.autocomplete-custom.js b/vendor/assets/javascripts/jquery.autocomplete-custom.js
index e10b9de6d..46901833f 100644
--- a/vendor/assets/javascripts/jquery.autocomplete-custom.js
+++ b/vendor/assets/javascripts/jquery.autocomplete-custom.js
@@ -571,7 +571,7 @@ $.Autocompleter.Select = function (options, input, select, config) {
 		element = $("<div/>")
 		.hide()
 		.addClass(options.resultsClass)
-		.css("position", "absolute")
+		.css("position", "fixed")
 		.appendTo(document.body);
 
 		list = $("<ul/>").appendTo(element).mouseover( function(event) {