diff --git a/src/shared/components/ui/calendar.tsx b/src/shared/components/ui/calendar.tsx
index 3691c84..5a7727d 100644
--- a/src/shared/components/ui/calendar.tsx
+++ b/src/shared/components/ui/calendar.tsx
@@ -197,6 +197,7 @@ function CalendarDayButton({
 	return (
 		<Button
 			ref={ref}
+			type="button"
 			variant="ghost"
 			size="icon"
 			data-day={day.date.toLocaleDateString()}
diff --git a/src/shared/components/ui/date-picker.tsx b/src/shared/components/ui/date-picker.tsx
index ea2878d..2861fdf 100644
--- a/src/shared/components/ui/date-picker.tsx
+++ b/src/shared/components/ui/date-picker.tsx
@@ -148,7 +148,7 @@ export function DatePicker({
 				required={required}
 				disabled={disabled}
 			/>
-			<Popover open={open} onOpenChange={setOpen}>
+			<Popover modal open={open} onOpenChange={setOpen}>
 				<PopoverTrigger asChild>
 					<Button
 						type="button"