diff --git a/src/__tests__/date-validation.test.ts b/src/__tests__/date-validation.test.ts
index 084252d8..bf28753f 100644
--- a/src/__tests__/date-validation.test.ts
+++ b/src/__tests__/date-validation.test.ts
@@ -2,10 +2,10 @@ import { describe, expect, it } from 'vitest';
 import { apiDateString, dateStringForFormat } from '$lib/domain/shared';
 import { maintenanceFormSchema } from '$lib/domain/maintenance';
 import { complianceFormSchema } from '$lib/domain/compliance';
-import { formatDate, type FormatConfig } from '$lib/helper/date.helper';
+import { formatDate, parseDateForCalendar, type FormatConfig } from '$lib/helper/date.helper';
 
 const formatConfig: FormatConfig = {
-  dateFormat: 'd. MMMM yyyy',
+  dateFormat: 'dd/MM/yyyy',
   timezone: 'UTC',
   locale: 'en',
   currency: 'USD',
@@ -17,13 +17,33 @@ const formatConfig: FormatConfig = {
 };
 
 describe('localized date validation', () => {
+  it('restores calendar dates using the configured display format', () => {
+    const dayFirst = parseDateForCalendar('13/08/2026', formatConfig);
+    const monthFirst = parseDateForCalendar('08/13/2026', {
+      ...formatConfig,
+      dateFormat: 'MM/dd/yyyy'
+    });
+
+    expect(dayFirst?.toString()).toBe('2026-08-13');
+    expect(monthFirst?.toString()).toBe('2026-08-13');
+  });
+
+  it('does not restore invalid calendar input values', () => {
+    expect(parseDateForCalendar('31/02/2026', formatConfig)).toBeUndefined();
+    expect(parseDateForCalendar(undefined, formatConfig)).toBeUndefined();
+  });
+
   it.each([
     ['cs', '3. září 2026'],
     ['ru', '3. сентября 2026']
   ])('formats dates with %s month names', (locale, expected) => {
-    expect(formatDate(new Date('2026-09-03T12:00:00Z'), { ...formatConfig, locale })).toBe(
-      expected
-    );
+    expect(
+      formatDate(new Date('2026-09-03T12:00:00Z'), {
+        ...formatConfig,
+        locale,
+        dateFormat: 'd. MMMM yyyy'
+      })
+    ).toBe(expected);
   });
 
   it('accepts days greater than 12 in day-first formats', () => {
diff --git a/src/lib/components/app/input.svelte b/src/lib/components/app/input.svelte
index aac8f3bc..e9b68d87 100644
--- a/src/lib/components/app/input.svelte
+++ b/src/lib/components/app/input.svelte
@@ -4,8 +4,9 @@
   import type { Component } from 'svelte';
   import * as Popover from '$ui/popover';
   import { Calendar } from '$lib/components/ui/calendar/index.js';
-  import { formatDateForCalendar } from '$lib/helper/format.helper';
+  import { formatDateForCalendar, parseDateForCalendar } from '$lib/helper/format.helper';
   import * as m from '$lib/paraglide/messages';
+  import type { DateValue } from '@internationalized/date';
 
   type InputType = Exclude<HTMLInputTypeAttribute, 'file'> | 'calendar';
 
@@ -27,6 +28,13 @@
   }: Props = $props();
 
   let open = $state(false);
+  let calendarValue = $state<DateValue>();
+
+  $effect(() => {
+    if (open) {
+      calendarValue = typeof value === 'string' ? parseDateForCalendar(value) : undefined;
+    }
+  });
 </script>
 
 <div id="input-wrapper" class="relative">
@@ -75,6 +83,7 @@
           id="date-calendar"
           type="single"
           captionLayout="dropdown"
+          bind:value={calendarValue}
           onValueChange={(v) => {
             if (v) {
               value = formatDateForCalendar(v);
diff --git a/src/lib/components/ui/calendar/calendar-month-select.svelte b/src/lib/components/ui/calendar/calendar-month-select.svelte
index a95f8483..c47a1fca 100644
--- a/src/lib/components/ui/calendar/calendar-month-select.svelte
+++ b/src/lib/components/ui/calendar/calendar-month-select.svelte
@@ -23,6 +23,7 @@
       <select {...props} {value} {onchange}>
         {#each monthItems as monthItem (monthItem.value)}
           <option
+            class="bg-popover text-popover-foreground"
             value={monthItem.value}
             selected={value !== undefined
               ? monthItem.value === value
diff --git a/src/lib/components/ui/calendar/calendar-year-select.svelte b/src/lib/components/ui/calendar/calendar-year-select.svelte
index f3c10206..486795b1 100644
--- a/src/lib/components/ui/calendar/calendar-year-select.svelte
+++ b/src/lib/components/ui/calendar/calendar-year-select.svelte
@@ -22,6 +22,7 @@
       <select {...props} {value}>
         {#each yearItems as yearItem (yearItem.value)}
           <option
+            class="bg-popover text-popover-foreground"
             value={yearItem.value}
             selected={value !== undefined
               ? yearItem.value === value
diff --git a/src/lib/helper/date.helper.ts b/src/lib/helper/date.helper.ts
index e8a12b81..e775957a 100644
--- a/src/lib/helper/date.helper.ts
+++ b/src/lib/helper/date.helper.ts
@@ -1,4 +1,4 @@
-import type { DateValue } from '@internationalized/date';
+import { CalendarDate, type DateValue } from '@internationalized/date';
 import { format, parse } from 'date-fns';
 import { formatInTimeZone, fromZonedTime } from 'date-fns-tz';
 import { ar, cs, de, enUS, es, fi, fr, hi, hu, it, pt, ro, ru } from 'date-fns/locale';
@@ -66,6 +66,22 @@ export const formatDateForCalendar = (date: DateValue, config: FormatConfig): st
   return format(dateObj, config.dateFormat, { locale: getDateFnsLocale(config.locale) });
 };
 
+export const parseDateForCalendar = (
+  date: string | undefined,
+  config: FormatConfig
+): CalendarDate | undefined => {
+  if (!date) return undefined;
+
+  const parsedDate = parse(date, config.dateFormat, new Date());
+  if (Number.isNaN(parsedDate.getTime())) return undefined;
+
+  return new CalendarDate(
+    parsedDate.getFullYear(),
+    parsedDate.getMonth() + 1,
+    parsedDate.getDate()
+  );
+};
+
 export const parseDate = (date: string, config: FormatConfig) => {
   const parsedDate = parse(date, config.dateFormat, new Date());
   return fromZonedTime(parsedDate, config.timezone);
diff --git a/src/lib/helper/format.helper.ts b/src/lib/helper/format.helper.ts
index 2b7d653e..97c704c8 100644
--- a/src/lib/helper/format.helper.ts
+++ b/src/lib/helper/format.helper.ts
@@ -3,6 +3,7 @@ import type { FormatConfig } from './date.helper';
 import {
   formatDate as formatDatePure,
   formatDateForCalendar as formatDateForCalendarPure,
+  parseDateForCalendar as parseDateForCalendarPure,
   parseDate as parseDatePure
 } from './date.helper';
 export type { FormatConfig };
@@ -22,6 +23,8 @@ import {
 export const formatDate = (date: Date | string) => formatDatePure(date, configs);
 export const formatDateForCalendar = (date: import('@internationalized/date').DateValue) =>
   formatDateForCalendarPure(date, configs);
+export const parseDateForCalendar = (date: string | undefined) =>
+  parseDateForCalendarPure(date, configs);
 export const parseDate = (date: string) => parseDatePure(date, configs);
 export const getCurrencySymbol = (currency?: string) =>
   getCurrencySymbolPure(currency || configs.currency);