diff --git a/app/assets/javascripts/discourse/app/lib/autocomplete.js b/app/assets/javascripts/discourse/app/lib/autocomplete.js
index 03fc408a915..eea9f8e417f 100644
--- a/app/assets/javascripts/discourse/app/lib/autocomplete.js
+++ b/app/assets/javascripts/discourse/app/lib/autocomplete.js
@@ -274,6 +274,9 @@ export default function(options) {
     ul.find("li").click(function() {
       selectedOption = ul.find("li").index(this);
       completeTerm(autocompleteOptions[selectedOption]);
+      if (!options.single) {
+        me.focus();
+      }
       return false;
     });
     var pos = null;