diff --git a/src/features/reports/components/category-report-filters.tsx b/src/features/reports/components/category-report-filters.tsx
index 248f79c..8869730 100644
--- a/src/features/reports/components/category-report-filters.tsx
+++ b/src/features/reports/components/category-report-filters.tsx
@@ -228,6 +228,7 @@ export function CategoryReportFilters({
 					<Popover open={startMonthOpen} onOpenChange={setStartMonthOpen}>
 						<PopoverTrigger asChild>
 							<Button
+								type="button"
 								variant="outline"
 								className="w-[calc(50%-0.25rem)] md:w-[150px] justify-start text-sm border-dashed"
 								disabled={isLoading}
@@ -248,6 +249,7 @@ export function CategoryReportFilters({
 					<Popover open={endMonthOpen} onOpenChange={setEndMonthOpen}>
 						<PopoverTrigger asChild>
 							<Button
+								type="button"
 								variant="outline"
 								className="w-[calc(50%-0.25rem)] md:w-[150px] justify-start text-sm border-dashed"
 								disabled={isLoading}
diff --git a/src/features/transactions/components/dialogs/mass-add-dialog.tsx b/src/features/transactions/components/dialogs/mass-add-dialog.tsx
index f7000be..41bb155 100644
--- a/src/features/transactions/components/dialogs/mass-add-dialog.tsx
+++ b/src/features/transactions/components/dialogs/mass-add-dialog.tsx
@@ -72,7 +72,7 @@ function InlinePeriodPicker({
 	return (
 		<div className="-mt-1">
 			<span className="text-xs text-muted-foreground">Fatura de </span>
-			<Popover open={open} onOpenChange={setOpen}>
+			<Popover modal open={open} onOpenChange={setOpen}>
 				<PopoverTrigger asChild>
 					<button
 						type="button"
diff --git a/src/features/transactions/components/dialogs/transaction-dialog/payment-method-section.tsx b/src/features/transactions/components/dialogs/transaction-dialog/payment-method-section.tsx
index 808a261..6c0a3f5 100644
--- a/src/features/transactions/components/dialogs/transaction-dialog/payment-method-section.tsx
+++ b/src/features/transactions/components/dialogs/transaction-dialog/payment-method-section.tsx
@@ -45,7 +45,7 @@ function InlinePeriodPicker({
 	return (
 		<div className="ml-1">
 			<span className="text-xs text-muted-foreground">Fatura de </span>
-			<Popover open={open} onOpenChange={setOpen}>
+			<Popover modal open={open} onOpenChange={setOpen}>
 				<PopoverTrigger asChild>
 					<button
 						type="button"
diff --git a/src/shared/components/entity-avatar/establishment-logo-picker.tsx b/src/shared/components/entity-avatar/establishment-logo-picker.tsx
index 276761a..932513f 100644
--- a/src/shared/components/entity-avatar/establishment-logo-picker.tsx
+++ b/src/shared/components/entity-avatar/establishment-logo-picker.tsx
@@ -102,7 +102,7 @@ export function EstablishmentLogoPicker({
 	}
 
 	return (
-		<Popover open={open} onOpenChange={onOpenChange}>
+		<Popover modal open={open} onOpenChange={onOpenChange}>
 			<PopoverTrigger asChild>{children}</PopoverTrigger>
 			<PopoverContent className="w-80 p-3" align="start" side="bottom">
 				<p className="mb-2 text-muted-foreground text-xs">
diff --git a/src/shared/components/month-picker/month-navigation.tsx b/src/shared/components/month-picker/month-navigation.tsx
index b91e5e2..b8a56dc 100644
--- a/src/shared/components/month-picker/month-navigation.tsx
+++ b/src/shared/components/month-picker/month-navigation.tsx
@@ -93,6 +93,7 @@ export default function MonthNavigation() {
 					<Popover open={isPickerOpen} onOpenChange={setIsPickerOpen}>
 						<PopoverTrigger asChild>
 							<Button
+								type="button"
 								variant="ghost"
 								size="sm"
 								disabled={isPending}
diff --git a/src/shared/components/period-picker.tsx b/src/shared/components/period-picker.tsx
index e6b5821..7e33826 100644
--- a/src/shared/components/period-picker.tsx
+++ b/src/shared/components/period-picker.tsx
@@ -44,9 +44,10 @@ export function PeriodPicker({
 	};
 
 	return (
-		<Popover open={open} onOpenChange={setOpen}>
+		<Popover modal open={open} onOpenChange={setOpen}>
 			<PopoverTrigger asChild>
 				<Button
+					type="button"
 					variant={variant}
 					size={size}
 					disabled={disabled}
diff --git a/src/shared/components/ui/month-picker.tsx b/src/shared/components/ui/month-picker.tsx
index a766c25..f6ef844 100644
--- a/src/shared/components/ui/month-picker.tsx
+++ b/src/shared/components/ui/month-picker.tsx
@@ -128,6 +128,7 @@ function MonthCal({
 				</div>
 				<div className="space-x-1 flex items-center">
 					<button
+						type="button"
 						onClick={() => {
 							setMenuYear(menuYear - 1);
 							if (onYearBackward) onYearBackward();
@@ -140,6 +141,7 @@ function MonthCal({
 						<RiArrowLeftSFill className="opacity-50 size-4" />
 					</button>
 					<button
+						type="button"
 						onClick={() => {
 							setMenuYear(menuYear + 1);
 							if (onYearForward) onYearForward();
@@ -165,6 +167,7 @@ function MonthCal({
 											className="h-10 w-1/4 text-center text-sm p-0 relative [&:has([aria-selected].day-range-end)]:rounded-r-md [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected])]:bg-accent first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md focus-within:relative focus-within:z-20"
 										>
 											<button
+												type="button"
 												onClick={() => {
 													setMonth(m.number);
 													setYear(menuYear);