diff --git a/js/ckeditor5_plugins/linkit/src/index.js b/js/ckeditor5_plugins/linkit/src/index.js
index 3ef7be0..612d648 100644
--- a/js/ckeditor5_plugins/linkit/src/index.js
+++ b/js/ckeditor5_plugins/linkit/src/index.js
@@ -79,11 +79,6 @@ class Linkit extends Plugin {
             selected = false;
           },
           closeHandler: (event) => {
-            if (!selected) {
-              this.set('entityType', null);
-              this.set('entityUuid', null);
-              this.set('entitySubstitution', null);
-            }
             selected = false;
           },
         },
@@ -99,6 +94,14 @@ class Linkit extends Plugin {
     const linkFormView = editor.plugins.get('LinkUI').formView;
     const linkCommand = editor.commands.get('link');
 
+    // Only selections from autocomplete set converter attributes.
+    const linkit = editor.plugins.get('Linkit');
+    linkFormView.urlInputView.fieldView.element.addEventListener('input', function (evt) {
+      linkit.set('entityType', null);
+      linkit.set('entityUuid', null);
+      linkit.set('entitySubstitution', null);
+    });
+
     this.listenTo(linkFormView, 'submit', () => {
       const values = {
         'data-entity-type': this.entityType,