diff --git a/api/js/etemplate/Et2Box/Et2Box.ts b/api/js/etemplate/Et2Box/Et2Box.ts
index 396f8c84a16..a93489f5e35 100644
--- a/api/js/etemplate/Et2Box/Et2Box.ts
+++ b/api/js/etemplate/Et2Box/Et2Box.ts
@@ -133,7 +133,13 @@ export class Et2VBox extends Et2Box
 			css`
             :host > div {
             	flex-direction: column;
-			}`
+			}
+			/* CSS for child elements */
+            ::slotted(*) {
+            	/* Stop children from growing vertically.  In general we want them to stay their "normal" height */
+            	flex-grow: 0;
+            }
+			`
 		];
 	}
 }
diff --git a/api/js/jsapi/egw_utils.js b/api/js/jsapi/egw_utils.js
index e08680f7d50..a70878f9e74 100644
--- a/api/js/jsapi/egw_utils.js
+++ b/api/js/jsapi/egw_utils.js
@@ -275,6 +275,17 @@ egw.extend('utils', egw.MODULE_GLOBAL, function()
 						old[name] = this.style[name];
 					}
 				}
+				else if (this.computedStyleMap)
+				{
+					for (var name in props)
+					{
+						let s = this.computedStyleMap().get(name)
+						if (s)
+						{
+							old[name] = s.value || "";
+						}
+					}
+				}
 				jQuery(this).show();
 				oldProps.push(old);
 			});