diff --git a/etemplate/js/et2_dataview_view_rowProvider.js b/etemplate/js/et2_dataview_view_rowProvider.js
index 496c00a629..a2ca8aeb69 100644
--- a/etemplate/js/et2_dataview_view_rowProvider.js
+++ b/etemplate/js/et2_dataview_view_rowProvider.js
@@ -323,6 +323,7 @@ var et2_dataview_rowProvider = Class.extend({
 
 		// Create the row widget and insert the given widgets into the row
 		var rowWidget = new et2_dataview_rowWidget(rowTemplate.mgrs, row[0]);
+		rowWidget._parent = _rootWidget;
 		rowWidget.createWidgets(_widgets);
 
 		// Get the set containing all variable attributes
@@ -500,12 +501,12 @@ var et2_dataview_rowWidget = et2_widget.extend(et2_IDOMNode, {
 
 var et2_dataview_rowTemplateWidget = et2_widget.extend(et2_IDOMNode, {
 
-	init: function(_mgrs, _row) {
+	init: function(_root, _row) {
 		// Call the parent constructor with some dummy attributes
 		this._super(null, {"id": "", "type": "rowTemplateWidget"});
 
-		// Copy the managers - do not use "setArrayMgrs" here
-		this._mgrs = _mgrs;
+		this._root = _root;
+		this._mgrs = {};
 		this._row = _row;
 
 		// Clone the widgets inside the placeholders array
diff --git a/etemplate/js/et2_widget_button.js b/etemplate/js/et2_widget_button.js
index a277a05d0b..1590a58b7b 100644
--- a/etemplate/js/et2_widget_button.js
+++ b/etemplate/js/et2_widget_button.js
@@ -174,10 +174,10 @@ var et2_button = et2_baseWidget.extend([et2_IInput, et2_IDetachedDOM], {
 		if (typeof _values["onclick"] == "function")
 		{
 			this.options.onclick = _values["onclick"];
-			this.btn.bind("click.et2_baseWidget", this, function(e) {
-				return e.data.click.call(e.data,e);
-			});
 		}
+		this.btn.bind("click.et2_baseWidget", this, function(e) {
+			return e.data.click.call(e.data,e);
+		});
 
 	}
 });