diff --git a/api/js/etemplate/Et2Date/Et2DateDuration.ts b/api/js/etemplate/Et2Date/Et2DateDuration.ts
index 6c08234857..6cd0676510 100644
--- a/api/js/etemplate/Et2Date/Et2DateDuration.ts
+++ b/api/js/etemplate/Et2Date/Et2DateDuration.ts
@@ -9,11 +9,12 @@
  */
 
 
-import {css, html, LitElement} from "@lion/core";
+import {classMap, css, html, LitElement} from "@lion/core";
 import {Et2InputWidget} from "../Et2InputWidget/Et2InputWidget";
 import {sprintf} from "../../egw_action/egw_action_common";
 import {dateStyles} from "./DateStyles";
 import {FormControlMixin} from "@lion/form-core";
+import shoelace from "../Styles/shoelace";
 
 export interface formatOptions
 {
@@ -116,6 +117,7 @@ export class Et2DateDuration extends Et2InputWidget(FormControlMixin(LitElement)
 	{
 		return [
 			...super.styles,
+			shoelace,
 			...dateStyles,
 			css`
 			.form-field__group-two {
@@ -126,7 +128,9 @@ export class Et2DateDuration extends Et2InputWidget(FormControlMixin(LitElement)
 				flex-direction: row;
 				flex-wrap: nowrap;
 				align-items: baseline;
-				gap: 1ex;
+			}
+			.input-group__after {
+				margin-inline-start: var(--sl-input-spacing-medium);
 			}
 			et2-select {
 				color: var(--input-text-color);
@@ -368,8 +372,13 @@ export class Et2DateDuration extends Et2InputWidget(FormControlMixin(LitElement)
 	render()
 	{
 		return html`
-            <div part="form-control" class="form-control">
-                <div class="form-field__group-one" part="form-control-label">${this._groupOneTemplate()}</div>
+            <div part="form-control" class=${classMap({
+                'form-control': true,
+                'form-control--has-label': this.label.split("%")[0] || false
+            })}>
+                <div class="form-field__group-one form-control__label" 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/Styles/shoelace.ts b/api/js/etemplate/Styles/shoelace.ts
index 2c326eeed8..1db59c9957 100644
--- a/api/js/etemplate/Styles/shoelace.ts
+++ b/api/js/etemplate/Styles/shoelace.ts
@@ -59,4 +59,9 @@ export default [sl_css, css`
   .tab-group--top .tab-group__tabs {
       --track-width: 3px;
   }
+  .form-control--has-label .form-control__label {
+    display: inline-block;
+    color: var(--sl-input-label-color);
+    margin-right: var(--sl-spacing-medium);
+  }
   `];
\ No newline at end of file
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index df63659835..3773c41781 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -77,11 +77,11 @@
 .hide {
     display: none;
 }
+
 /* Put widget label to the left of the widget, with fixed width */
 ::part(form-control) {
     display: flex;
     align-items: center;
-    gap: 1em;
     flex-wrap: wrap;
 }