diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index 7750475c3..6b7ec5e14 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -220,6 +220,13 @@ export default function(options) {
       vOffset = div.height();
     }
 
+    if (Discourse.Mobile.mobileView && !isInput) {
+      div.css('width', 'auto');
+
+      if ((me.height() / 2) >= pos.top) { vOffset = -23; }
+      if ((me.width() / 2) <= pos.left) { hOffset = -div.width(); }
+    }
+
     var mePos = me.position();
     var borderTop = parseInt(me.css('border-top-width'), 10) || 0;
     div.css({