diff --git a/etemplate/js/et2_widget_hbox.js b/etemplate/js/et2_widget_hbox.js
index d581b20a3c..69c6ee8d2d 100644
--- a/etemplate/js/et2_widget_hbox.js
+++ b/etemplate/js/et2_widget_hbox.js
@@ -161,6 +161,17 @@ var et2_hbox = et2_baseWidget.extend({
 
 		// Normally simply return the hbox-div
 		return this._super.apply(this, arguments);
+	},
+
+	/**
+	 * Tables added to the root node need to be inline instead of blocks
+	 */
+	addChild: function(child) {
+		this._super.apply(this, arguments);
+		if(child.instanceOf && child.instanceOf(et2_grid) || child._type == 'et2_grid')
+		{
+			jQuery(child.getDOMNode(child)).css("display", "inline-table");
+		}
 	}
 });