diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldInput.tsx
index 398013252..91b160253 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldInput.tsx
@@ -192,6 +192,7 @@ export const MultiItemFieldInput = <T,>({
                   })
               : undefined
           }
+          onEscape={handleDropdownClose}
           onChange={(event) =>
             handleOnChange(
               turnIntoEmptyStringIfWhitespacesOnly(event.target.value),
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
index 16a4b12e8..5f5b6f79c 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
@@ -72,7 +72,7 @@ export const DateInput = ({
     closeDropdownMonthSelect();
     closeDropdown();
 
-    onEnter?.(internalValue);
+    onEnter(internalValue);
   };
 
   const handleEscape = () => {
@@ -80,7 +80,7 @@ export const DateInput = ({
     closeDropdownMonthSelect();
     closeDropdown();
 
-    onEscape?.(internalValue);
+    onEscape(internalValue);
   };
 
   const handleClickOutside = (event: MouseEvent | TouchEvent) => {