diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
index 5f2c632527..01380cee61 100644
--- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
+++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
@@ -1861,10 +1861,12 @@ public class Schema2XForms implements Serializable
                       path,
                       occurs,
                       resourceBundle);
-      
+					  
+      Object poppedElement = this.parentStack.pop();
+	  
       if (LOGGER.isDebugEnabled())
       {
-         LOGGER.debug("[addElementToGroup] popped element " + this.parentStack.pop() + " from parent stack");
+         LOGGER.debug("[addElementToGroup] popped element " + poppedElement + " from parent stack");
          LOGGER.debug("[addElementToGroup] adding " + (occurs.maximum == 1
                                 ? 1
                                 : occurs.minimum + 1) +
diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js
index ba9a89c9ac..c86182aa87 100644
--- a/source/web/scripts/ajax/xforms.js
+++ b/source/web/scripts/ajax/xforms.js
@@ -3732,6 +3732,9 @@ alfresco.xforms.Repeat = alfresco.xforms.VGroup.extend({
     event.stopPropagation();
     if (this.isRemoveRepeatItemEnabled())
     {
+      // set tinymce current instance to null
+      alfresco.xforms.RichTextEditor.currentInstance = null;
+
       var index = this._repeatControls.indexOf(event.target.parentNode);
       var repeatItem = this.getChildAt(index);
       this.setFocusedChild(repeatItem);