diff --git a/modules/Cockpit/assets/components/field-layout.tag b/modules/Cockpit/assets/components/field-layout.tag
index 2473cf0df..684596635 100644
--- a/modules/Cockpit/assets/components/field-layout.tag
+++ b/modules/Cockpit/assets/components/field-layout.tag
@@ -468,8 +468,16 @@
         remove(e) {
             this.items.splice(e.item.idx, 1);
 
+            function checkParent(child) {
+                if(!child.parent){
+                    child.update();
+                }else{
+                    checkParent(child.parent);
+                }
+            }
+
             if (opts.child) {
-                this.parent.update()
+                checkParent(this);
             }
         }
 
diff --git a/modules/Collections/views/entry.php b/modules/Collections/views/entry.php
index 74f448818..7346d276a 100755
--- a/modules/Collections/views/entry.php
+++ b/modules/Collections/views/entry.php
@@ -336,7 +336,7 @@
 
                     App.ui.notify("Saving successful", "success");
 
-                    _.extend($this.entry, entry);
+                    _.extend(entry, $this.entry);
 
                     $this.fields.forEach(function(field){