diff --git a/src/bundle/Resources/public/js/CKEditor/custom-tags/block-custom-tag/custom-tag-ui.js b/src/bundle/Resources/public/js/CKEditor/custom-tags/block-custom-tag/custom-tag-ui.js
index 0d6b9b36..845e72de 100644
--- a/src/bundle/Resources/public/js/CKEditor/custom-tags/block-custom-tag/custom-tag-ui.js
+++ b/src/bundle/Resources/public/js/CKEditor/custom-tags/block-custom-tag/custom-tag-ui.js
@@ -95,8 +95,7 @@ class IbexaCustomTagUI extends Plugin {
         const formView = new IbexaCustomTagFormView({ locale: this.editor.locale });
 
         this.listenTo(formView, 'save-custom-tag', () => {
-            const modelElement = this.editor.model.document.selection.getSelectedElement();
-            const values = modelElement.getAttribute('values');
+            const values = this.activeModelElement.getAttribute('values');
             const newValues = { ...values };
 
             this.isNew = false;
@@ -112,7 +111,7 @@ class IbexaCustomTagUI extends Plugin {
             });
 
             this.editor.model.change((writer) => {
-                writer.setAttribute('values', newValues, modelElement);
+                writer.setAttribute('values', newValues, this.activeModelElement);
             });
 
             this.reinitAttributesView();
@@ -151,8 +150,9 @@ class IbexaCustomTagUI extends Plugin {
     }
 
     showForm() {
-        const modelElement = this.editor.model.document.selection.getSelectedElement();
-        const values = modelElement.getAttribute('values');
+        this.activeModelElement = this.editor.model.document.selection.getSelectedElement();
+
+        const values = this.activeModelElement.getAttribute('values');
         const parsedValues = Object.entries(values).reduce((output, [key, value]) => {
             if (this.config.attributes[key]?.type === 'boolean') {
                 return {
@@ -189,14 +189,14 @@ class IbexaCustomTagUI extends Plugin {
     }
 
     removeCustomTag() {
-        const modelElement = this.editor.model.document.selection.getSelectedElement();
-
         this.editor.model.change((writer) => {
             if (this.balloon.hasView(this.attributesView)) {
                 this.hideAttributes();
             }
 
-            writer.remove(modelElement);
+            writer.remove(this.activeModelElement);
+
+            this.activeModelElement = null;
         });
     }
 
@@ -209,13 +209,16 @@ class IbexaCustomTagUI extends Plugin {
     }
 
     addCustomTag() {
+        if (this.balloon.hasView(this.formView)) {
+            return;
+        }
+
         const values = Object.entries(this.config.attributes).reduce((outputValues, [attributeName, config]) => {
             outputValues[attributeName] = config.defaultValue;
 
             return outputValues;
         }, {});
 
-        this.editor.focus();
         this.editor.execute('insertIbexaCustomTag', { customTagName: this.componentName, values });
 
         if (this.hasAttributes()) {