diff --git a/js/tag-it.js b/js/tag-it.js
index c15103bc..5bba90d3 100644
--- a/js/tag-it.js
+++ b/js/tag-it.js
@@ -266,7 +266,8 @@
                         }
 
                         // Autocomplete will create its own tag from a selection and close automatically.
-                        if (!that.tagInput.data('autocomplete-open')) {
+                        if (!(that.options.autocomplete.autoFocus && that.tagInput.data('autocomplete-open'))) {
+                            that.tagInput.autocomplete('close');
                             that.createTag(that._cleanedInput());
                         }
                     }