diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 6dedac3df7..b84c87fac6 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -1388,15 +1388,18 @@ div.message.floating {
 }
 
 /* Allow space for category color indicators, preserving column calculations */
-.egwGridView_outer thead tr > th:first-child {
+.et2_nextmatch .egwGridView_outer thead tr > th:first-child {
 	border-left: 6px solid transparent;
 }
 .egwGridView_scrollarea tr.row_category > td:first-child  {
 	border-left: 6px solid transparent;
 }
-.egwGridView_outer .egwGridView_scrollarea tbody tr.row_category td:first-child > div {
+.et2_nextmatch .egwGridView_grid, .et2_nextmatch .egwGridView_outer {
+	border-collapse: separate;
+}
+.et2_nextmatch .egwGridView_outer .egwGridView_scrollarea tbody tr.row_category td:first-child > div {
 	margin-left:-6px;
-	margin-right: -4px;
+	margin-right: 2px;
 	padding-left: 4px;
 }