diff --git a/api/js/etemplate/Et2Date/Et2Date.ts b/api/js/etemplate/Et2Date/Et2Date.ts
index 73e5a96979..d587af2195 100644
--- a/api/js/etemplate/Et2Date/Et2Date.ts
+++ b/api/js/etemplate/Et2Date/Et2Date.ts
@@ -875,8 +875,10 @@ export class Et2Date extends Et2InputWidget(FormControlMixin(LitFlatpickr))
 	render()
 	{
 		return html`
-            <div class="form-field__group-one">${this._groupOneTemplate()}</div>
-            <div class="form-field__group-two">${this._groupTwoTemplate()}</div>
+            <div part="form-control" class="form-control">
+                <div class="form-field__group-one" part="form-control-label">${this._groupOneTemplate()}</div>
+                <div class="form-field__group-two" part="form-control-input">${this._groupTwoTemplate()}</div>
+            </div>
 		`;
 	}
 
diff --git a/api/js/etemplate/Et2Date/Et2DateDuration.ts b/api/js/etemplate/Et2Date/Et2DateDuration.ts
index b9d322633e..c3155620ed 100644
--- a/api/js/etemplate/Et2Date/Et2DateDuration.ts
+++ b/api/js/etemplate/Et2Date/Et2DateDuration.ts
@@ -357,6 +357,17 @@ export class Et2DateDuration extends Et2InputWidget(FormControlMixin(LitElement)
 		return this.__displayFormat;
 	}
 
+
+	render()
+	{
+		return html`
+            <div part="form-control" class="form-control">
+                <div class="form-field__group-one" part="form-control-label">${this._groupOneTemplate()}</div>
+                <div class="form-field__group-two" part="form-control-input">${this._groupTwoTemplate()}</div>
+            </div>
+		`;
+	}
+
 	/**
 	 * @return {TemplateResult}
 	 * @protected