diff --git a/packages/input-datepicker/src/LionInputDatepicker.js b/packages/input-datepicker/src/LionInputDatepicker.js
index 9f2edd88a..25bd33dd5 100644
--- a/packages/input-datepicker/src/LionInputDatepicker.js
+++ b/packages/input-datepicker/src/LionInputDatepicker.js
@@ -151,7 +151,7 @@ export class LionInputDatepicker extends ScopedElementsMixin(OverlayMixin(LionIn
   }
 
   get _calendarNode() {
-    return this._overlayCtrl.contentNode.querySelector('#calendar');
+    return this._overlayCtrl.contentNode.querySelector('[slot="content"]');
   }
 
   constructor() {
@@ -243,7 +243,6 @@ export class LionInputDatepicker extends ScopedElementsMixin(OverlayMixin(LionIn
     return html`
       <lion-calendar
         slot="content"
-        id="calendar"
         .selectedDate="${this.constructor.__getSyncDownValue(this.modelValue)}"
         .minDate="${this.__calendarMinDate}"
         .maxDate="${this.__calendarMaxDate}"
diff --git a/packages/input-datepicker/test-helpers/DatepickerInputObject.js b/packages/input-datepicker/test-helpers/DatepickerInputObject.js
index 81f3e3393..c6482de8b 100644
--- a/packages/input-datepicker/test-helpers/DatepickerInputObject.js
+++ b/packages/input-datepicker/test-helpers/DatepickerInputObject.js
@@ -55,7 +55,7 @@ export class DatepickerInputObject {
   }
 
   get calendarEl() {
-    return this.overlayEl && this.overlayEl.querySelector('#calendar');
+    return this.el && this.el._calendarNode;
   }
 
   /**