diff --git a/app/client/src/components/ads/DatePickerComponent.tsx b/app/client/src/components/ads/DatePickerComponent.tsx
index 818850da2d..beccc1033f 100644
--- a/app/client/src/components/ads/DatePickerComponent.tsx
+++ b/app/client/src/components/ads/DatePickerComponent.tsx
@@ -182,6 +182,13 @@ function DatePickerComponent(props: DatePickerComponentProps) {
     setDatePickerVisibility(nextOpenState);
   }
 
+  function handleTimePickerKeydown(e: React.KeyboardEvent) {
+    if (e.key === "Enter") {
+      setDatePickerVisibility(false);
+      e.stopPropagation();
+    }
+  }
+
   return (
     <StyledDateInput
       className={Classes.DATE_PICKER_OVARLAY}
@@ -205,6 +212,9 @@ function DatePickerComponent(props: DatePickerComponentProps) {
         isOpen: isDatePickerVisible,
       }}
       showActionsBar={props.showActionsBar}
+      timePickerProps={{
+        onKeyDown: handleTimePickerKeydown,
+      }}
       timePrecision={props.timePrecision}
       value={props.value}
     />