diff --git a/packages/input-datepicker/src/LionInputDatepicker.js b/packages/input-datepicker/src/LionInputDatepicker.js
index 47b88bac5..edab0c613 100644
--- a/packages/input-datepicker/src/LionInputDatepicker.js
+++ b/packages/input-datepicker/src/LionInputDatepicker.js
@@ -227,8 +227,12 @@ export class LionInputDatepicker extends ScopedElementsMixin(OverlayMixin(LionIn
 
   render() {
     return html`
-      ${this._labelTemplate()} ${this._helpTextTemplate()} ${this._inputGroupTemplate()}
-      ${this._feedbackTemplate()} ${this._overlayTemplate()}
+      <div class="form-field__group-one">
+        ${this._groupOneTemplate()}
+      </div>
+      <div class="form-field__group-two">
+        ${this._groupTwoTemplate()} ${this._overlayTemplate()}
+      </div>
     `;
   }