diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index 5aa01e495..aeb2ffb1d 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -430,6 +430,10 @@ export default function(options) {
 
           term = me.val().substring(completeStart + (options.key ? 1 : 0), caretPosition);
 
+          if ((completeStart === caretPosition) && (term === options.key)) {
+            closeAutocomplete();
+          }
+
           updateAutoComplete(options.dataSource(term));
           return true;
         default: