diff --git a/packages/input-datepicker/src/LionInputDatepicker.js b/packages/input-datepicker/src/LionInputDatepicker.js
index 061311b04..6d9a24c1e 100644
--- a/packages/input-datepicker/src/LionInputDatepicker.js
+++ b/packages/input-datepicker/src/LionInputDatepicker.js
@@ -306,7 +306,10 @@ export class LionInputDatepicker extends LionInputDate {
 
   async __openCalendarOverlay() {
     this._overlayCtrl.show();
-    await this._calendarElement.updateComplete;
+    await Promise.all([
+      this._calendarOverlayElement.updateComplete,
+      this._calendarElement.updateComplete,
+    ]);
     this._onCalendarOverlayOpened();
   }