diff --git a/vite/src/views/products/plan/components/CustomiseIntervalPopover.tsx b/vite/src/views/products/plan/components/CustomiseIntervalPopover.tsx
index 396a39859..87137736c 100644
--- a/vite/src/views/products/plan/components/CustomiseIntervalPopover.tsx
+++ b/vite/src/views/products/plan/components/CustomiseIntervalPopover.tsx
@@ -48,6 +48,7 @@ export const CustomiseIntervalPopover = ({
 				sideOffset={-1}
 				onOpenAutoFocus={(e) => e.preventDefault()}
 				onCloseAutoFocus={(e) => e.preventDefault()}
+				onKeyDown={(e) => e.stopPropagation()}
 			>
 				<div className="mb-2">
 					<FieldLabel>Interval Count</FieldLabel>
diff --git a/vite/src/views/products/plan/components/edit-plan-details/SelectBillingCycle.tsx b/vite/src/views/products/plan/components/edit-plan-details/SelectBillingCycle.tsx
index b31d4fd5a..718a01ffa 100644
--- a/vite/src/views/products/plan/components/edit-plan-details/SelectBillingCycle.tsx
+++ b/vite/src/views/products/plan/components/edit-plan-details/SelectBillingCycle.tsx
@@ -54,7 +54,6 @@ export const SelectBillingCycle = ({
 				</SelectTrigger>
 				<SelectContent>
 					{Object.values(BillingInterval)
-						// .filter((interval) => interval !== BillingInterval.OneOff)
 						.filter((interval) => {
 							if (filterOneOff) {
 								return interval !== BillingInterval.OneOff;