diff --git a/bin/BrickEdit.js b/bin/BrickEdit.js
index e7c518e2a5c98f3f089cb0aa03bc1268ebaec0be..661b64e48803ec9cf6b40c1da16af878b1387893 100644
--- a/bin/BrickEdit.js
+++ b/bin/BrickEdit.js
@@ -221,7 +221,7 @@ define('package/quiqqer/bricks/bin/BrickEdit', [
 
                 return new Promise(function(resolve, reject)
                 {
-                    var data = this.getAttribute('data').attributes;
+                    var data = this.getAttribute('data');
 
                     data.customfields = this.$customfields;
 
@@ -684,11 +684,9 @@ define('package/quiqqer/bricks/bin/BrickEdit', [
                     return;
                 }
 
-                TableExtra.setStyle( 'display', null );
+                TableExtra.setStyle('display', null);
 
-                var Form = new Element('form', {
-                    'class' : 'brick-edit-extra-header-form'
-                }).wraps( TableExtra );
+                var Form = this.getContent().getElement('form');
 
                 var i, len, Row, text, Value, setting, extraFieldId;