diff --git a/components/DatePicker/Screen/Desktop.tsx b/components/DatePicker/Screen/Desktop.tsx
index 24ea57523..b1fc1292b 100644
--- a/components/DatePicker/Screen/Desktop.tsx
+++ b/components/DatePicker/Screen/Desktop.tsx
@@ -34,7 +34,7 @@ export default function DatePickerDesktop({
   const currentDate = dt().toDate()
   const startOfMonth = dt(currentDate).set("date", 1).toDate()
   const yesterday = dt(currentDate).subtract(1, "day").toDate()
-  const endDate = dt().add(365, "day").toDate()
+  const endDate = dt().add(395, "day").toDate()
   const endOfLastMonth = dt(endDate).endOf("month").toDate()
 
   function handleMonthChange(selected: Date) {
diff --git a/components/DatePicker/Screen/Mobile.tsx b/components/DatePicker/Screen/Mobile.tsx
index b02991c98..3af7bd34f 100644
--- a/components/DatePicker/Screen/Mobile.tsx
+++ b/components/DatePicker/Screen/Mobile.tsx
@@ -31,7 +31,7 @@ export default function DatePickerMobile({
   const startOfCurrentMonth = dt(currentDate).set("date", 1).toDate()
   const yesterday = dt(currentDate).subtract(1, "day").toDate()
 
-  const endDate = dt().add(365, "day").toDate()
+  const endDate = dt().add(395, "day").toDate()
   const endOfLastMonth = dt(endDate).endOf("month").toDate()
   return (
     <DayPicker
diff --git a/components/DatePicker/index.tsx b/components/DatePicker/index.tsx
index 727e75f79..962a8fc96 100644
--- a/components/DatePicker/index.tsx
+++ b/components/DatePicker/index.tsx
@@ -42,8 +42,8 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
   }
 
   function handleSelectDate(selected: Date) {
-    // Handle Enter key press on any other input fields trigger day click update
-    // Daypicker triggers onDayClick for a previous date on enter
+    /* check if selected date is not before todays date,
+     which happens when "Enter" key is pressed in any other input field of the form */
     if (!dt(selected).isBefore(dt(), "day")) {
       if (isSelectingFrom) {
         setValue(name, {
@@ -84,24 +84,28 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
         setIsOpen(false)
       }
     },
-    [setIsOpen, setValue, setIsSelectingFrom, selectedDate, name]
+    [setIsOpen, setValue, setIsSelectingFrom, selectedDate, name, ref]
   )
 
   function closeOnBlur(evt: FocusEvent) {
-    const target = evt.relatedTarget as HTMLElement
-    closeIfOutside(target)
+    if (isOpen) {
+      const target = evt.relatedTarget as HTMLElement
+      closeIfOutside(target)
+    }
   }
 
   useEffect(() => {
     function handleClickOutside(evt: Event) {
-      const target = evt.target as HTMLElement
-      closeIfOutside(target)
+      if (isOpen) {
+        const target = evt.target as HTMLElement
+        closeIfOutside(target)
+      }
     }
     document.body.addEventListener("click", handleClickOutside)
     return () => {
       document.body.removeEventListener("click", handleClickOutside)
     }
-  }, [closeIfOutside])
+  }, [closeIfOutside, isOpen])
 
   const selectedFromDate = dt(selectedDate.fromDate)
     .locale(lang)