diff --git a/src/core_modules/capture-core/components/FiltersForTypes/Date/From.component.js b/src/core_modules/capture-core/components/FiltersForTypes/Date/From.component.js
index ff8cce189b..b43b56a245 100644
--- a/src/core_modules/capture-core/components/FiltersForTypes/Date/From.component.js
+++ b/src/core_modules/capture-core/components/FiltersForTypes/Date/From.component.js
@@ -29,7 +29,7 @@ class FromDateFilterPlain extends Component<Props> {
         this.props.onBlur(FromDateFilterPlain.getValueObject(value));
     }
 
-    handleKeyPress = (event: SyntheticKeyboardEvent<HTMLInputElement>) => {
+    handleKeyDown = (event: SyntheticKeyboardEvent<HTMLInputElement>) => {
         if (event.key === 'Enter') {
             this.props.onEnterKey();
         }
@@ -41,7 +41,7 @@ class FromDateFilterPlain extends Component<Props> {
             <div>
                 {/* $FlowFixMe[cannot-spread-inexact] automated comment */}
                 <D2Date
-                    onKeyPress={this.handleKeyPress}
+                    onKeyDown={this.handleKeyDown}
                     onBlur={this.handleBlur}
                     placeholder={i18n.t('From')}
                     width={150}
diff --git a/src/core_modules/capture-core/components/FiltersForTypes/Date/To.component.js b/src/core_modules/capture-core/components/FiltersForTypes/Date/To.component.js
index 2bddefbfc2..ac4280daa0 100644
--- a/src/core_modules/capture-core/components/FiltersForTypes/Date/To.component.js
+++ b/src/core_modules/capture-core/components/FiltersForTypes/Date/To.component.js
@@ -32,7 +32,7 @@ class ToDateFilterPlain extends Component<Props> {
         this.props.onBlur(ToDateFilterPlain.getValueObject(value));
     }
 
-    handleKeyPress = (event: SyntheticKeyboardEvent<HTMLInputElement>) => {
+    handleKeyDown = (event: SyntheticKeyboardEvent<HTMLInputElement>) => {
         if (event.key === 'Enter') {
             this.props.onEnterKey(ToDateFilterPlain.getValueObject(this.props.value || ''));
         }
@@ -48,7 +48,7 @@ class ToDateFilterPlain extends Component<Props> {
             <div>
                 {/* $FlowFixMe[cannot-spread-inexact] automated comment */}
                 <D2Date
-                    onKeyPress={this.handleKeyPress}
+                    onKeyDown={this.handleKeyDown}
                     onBlur={this.handleBlur}
                     onDateSelectedFromCalendar={this.handleDateSelectedFromCalendar}
                     placeholder={i18n.t('To')}
diff --git a/src/core_modules/capture-core/components/FormFields/DateAndTime/D2Date/D2Date.component.js b/src/core_modules/capture-core/components/FormFields/DateAndTime/D2Date/D2Date.component.js
index f3a3bef5b0..bee77bb056 100644
--- a/src/core_modules/capture-core/components/FormFields/DateAndTime/D2Date/D2Date.component.js
+++ b/src/core_modules/capture-core/components/FormFields/DateAndTime/D2Date/D2Date.component.js
@@ -13,6 +13,7 @@ type Props = {
     inputWidth?: ?number,
     onBlur: (value: string) => void,
     onFocus?: ?() => void,
+    onKeyDown?: ?() => void,
     onDateSelectedFromCalendar?: () => void,
     classes?: Object,
     disabled?: boolean,