diff --git a/js/components/typeahead.js b/js/components/typeahead.js
index 62c2cd5a..864aab9d 100644
--- a/js/components/typeahead.js
+++ b/js/components/typeahead.js
@@ -133,6 +133,8 @@ Fliplet.FormBuilder.field('typeahead', {
       if (this.typeahead) {
         this.typeahead.options(val);
       }
+
+      this.typeahead.set(this.value);
     }
   }
 });
diff --git a/js/libs/form.js b/js/libs/form.js
index 1836d87f..ae50ed03 100644
--- a/js/libs/form.js
+++ b/js/libs/form.js
@@ -1586,11 +1586,13 @@ Fliplet().then(function() {
                       field.value = value;
                     }
 
-                    debouncedUpdate();
 
                     if (hasChanged) {
                       $form.triggerChange(field.name, field.value);
                     }
+
+                    getFields();
+                    debouncedUpdate();
                   });
                 },
                 get: function() {