diff --git a/app/client/src/components/ads/DatePickerComponent.tsx b/app/client/src/components/ads/DatePickerComponent.tsx
index fac3c1be19..9512c52ffc 100644
--- a/app/client/src/components/ads/DatePickerComponent.tsx
+++ b/app/client/src/components/ads/DatePickerComponent.tsx
@@ -132,7 +132,7 @@ function DatePickerComponent(props: DatePickerComponentProps) {
   function handleKeydown(e: KeyboardEvent) {
     if (document.activeElement === inputRef.current) {
       if (e.key === "Enter") {
-        setDatePickerVisibility(true);
+        setDatePickerVisibility((value) => !value);
       } else if (e.key === "Escape") {
         setDatePickerVisibility(false);
       } else if (e.key === "Tab") {