diff --git a/.changeset/shaky-impalas-think.md b/.changeset/shaky-impalas-think.md
new file mode 100644
index 0000000000..ed711c3243
--- /dev/null
+++ b/.changeset/shaky-impalas-think.md
@@ -0,0 +1,5 @@
+---
+'@solid-design-system/components': minor
+---
+
+Fixed the overlaping issue of the sd-popup being under the sd-datepicker's input form.
diff --git a/packages/components/src/components/datepicker/datepicker.ts b/packages/components/src/components/datepicker/datepicker.ts
index a0464dd13b..74861a3a94 100644
--- a/packages/components/src/components/datepicker/datepicker.ts
+++ b/packages/components/src/components/datepicker/datepicker.ts
@@ -1969,7 +1969,7 @@ export default class SdDatepicker extends SolidElement implements SolidFormContr
                   id="label"
                   part="form-control-floating-label"
                   class=${cx(
-                    'absolute left-4 z-20 pointer-events-none transition-all duration-200',
+                    'absolute left-4 z-10 pointer-events-none transition-all duration-200',
                     !isFloatingLabelActive
                       ? 'top-1/2 -translate-y-1/2'
                       : this.size === 'lg'
diff --git a/packages/components/src/components/popup/popup.ts b/packages/components/src/components/popup/popup.ts
index afe19afbce..71b0f1ecfb 100644
--- a/packages/components/src/components/popup/popup.ts
+++ b/packages/components/src/components/popup/popup.ts
@@ -469,7 +469,7 @@ export default class SdPopup extends SolidElement {
 
       <div
         part="popup"
-        class=${cx('isolate', this.strategy !== 'fixed' ? 'absolute' : 'fixed', !this.active && 'hidden')}
+        class=${cx('isolate z-20', this.strategy !== 'fixed' ? 'absolute' : 'fixed', !this.active && 'hidden')}
       >
         <slot></slot>
         ${this.arrow ? html`<div part="arrow" class="absolute rotate-45 -z-10" role="presentation"></div>` : ''}