diff --git a/packages/autocomplete-js/Autocomplete.js b/packages/autocomplete-js/Autocomplete.js
index c91c8ea..3a7a2ea 100644
--- a/packages/autocomplete-js/Autocomplete.js
+++ b/packages/autocomplete-js/Autocomplete.js
@@ -139,6 +139,10 @@ class Autocomplete {
 
   setValue = result => {
     this.input.value = result ? this.getResultValue(result) : ''
+    this.core.waitOnInput = true
+    setTimeout(() => {
+      this.core.waitOnInput = false
+    }, 500)
   }
 
   renderResult = (result, props) =>
diff --git a/packages/autocomplete/AutocompleteCore.js b/packages/autocomplete/AutocompleteCore.js
index 5c2c918..5742cb7 100644
--- a/packages/autocomplete/AutocompleteCore.js
+++ b/packages/autocomplete/AutocompleteCore.js
@@ -6,6 +6,7 @@ class AutocompleteCore {
   searchCounter = 0
   results = []
   selectedIndex = -1
+  waitOnInput = false
 
   constructor({
     search,
@@ -47,8 +48,10 @@ class AutocompleteCore {
 
   handleInput = event => {
     const { value } = event.target
-    this.updateResults(value)
-    this.value = value
+    if (!(this.waitOnInput && this.value === value)) {
+      this.updateResults(value)
+      this.value = value
+    }
   }
 
   handleKeyDown = event => {