diff --git a/etemplate/js/et2_dataview_controller.js b/etemplate/js/et2_dataview_controller.js
index e24a1a17c3..07fdbaf584 100644
--- a/etemplate/js/et2_dataview_controller.js
+++ b/etemplate/js/et2_dataview_controller.js
@@ -624,7 +624,7 @@ var et2_dataview_controller = Class.extend({
 				if(this.entry.idx == 0)
 				{
 					// Set the CSS for the level - required so columns line up
-					var indent = $j("<span class='indentation'/>").appendTo('body');
+					var indent = $j("<span class='indentation'/>").appendTo(tr);
 					egw.css(".subentry td div.innerContainer.level_"+d,
 						"margin-right:" + (parseInt(indent.css("margin-right")) * d) + "px"
 					);
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index ebbed90208..0cea7d3035 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -1078,11 +1078,14 @@ div.message.floating {
  * Grid / nextmatch Hierarchy
  */
 /* Make sure arrow & cell content don't overlap */
-.et2_nextmatch .egwGridView_grid span.arrow {
+.egwGridView_grid span.arrow {
   margin: 6px -12px 4px 4px;
   float: left;
   position: relative;
 }
+.egwGridView_grid span.arrow ~ div.innerContainer {
+  display: inline;
+}
 /* Indent the sub-grid */
 .egwGridView_grid .egwGridView_grid {
   margin-left: 10px;