diff --git a/assets/ts_src/event_listeners.ts b/assets/ts_src/event_listeners.ts
index d53e20d3..8f9d1f75 100644
--- a/assets/ts_src/event_listeners.ts
+++ b/assets/ts_src/event_listeners.ts
@@ -348,7 +348,7 @@ $(document).on("ajaxUI:start", function() {
 });
 
 //Register typeaheads
-$(document).on("ajaxUI:reload ajaxUI:start", function () {
+$(document).on("ajaxUI:reload ajaxUI:start attachment:create", function () {
     $('input[data-autocomplete]').each(function() {
         //@ts-ignore
         var engine = new Bloodhound({
diff --git a/templates/AdminPages/_attachments.html.twig b/templates/AdminPages/_attachments.html.twig
index 6c774ef7..7be983dd 100644
--- a/templates/AdminPages/_attachments.html.twig
+++ b/templates/AdminPages/_attachments.html.twig
@@ -98,5 +98,7 @@
         $(".selectpicker").selectpicker();
         $(".file").fileinput();
 
+        //Reinit typeahead:
+        $(document).trigger('attachment:create');
     }
 </script>
\ No newline at end of file
diff --git a/templates/Parts/edit/_attachments.html.twig b/templates/Parts/edit/_attachments.html.twig
index 8c5b5c20..42f274c0 100644
--- a/templates/Parts/edit/_attachments.html.twig
+++ b/templates/Parts/edit/_attachments.html.twig
@@ -90,5 +90,7 @@
         $(".selectpicker").selectpicker();
         $(".file").fileinput();
 
+        //Reinit typeahead:
+        $(document).trigger('attachment:create');
     }
 </script>
\ No newline at end of file