diff --git a/src/calendar-v1/RangeCalendar.ts b/src/calendar-v1/RangeCalendar.ts
index 5f13181a7..f91001951 100644
--- a/src/calendar-v1/RangeCalendar.ts
+++ b/src/calendar-v1/RangeCalendar.ts
@@ -4,6 +4,7 @@
  * to work with Reakit System
  */
 import { BoxOptions } from "reakit";
+import { createOnKeyDown } from "reakit-utils";
 import { createComponent, createHook } from "reakit-system";
 
 import { RANGE_CALENDAR_KEYS } from "./__keys";
@@ -27,14 +28,14 @@ export const useRangeCalendar = createHook<
   keys: RANGE_CALENDAR_KEYS,
 
   useProps({ setAnchorDate }, htmlProps) {
-    const onKeyDown = (e: any) => {
-      switch (e.key) {
-        case "Escape":
+    const onKeyDown = createOnKeyDown({
+      keyMap: {
+        Escape: () => {
           // Cancel the selection.
           setAnchorDate(null);
-          break;
-      }
-    };
+        },
+      },
+    });
 
     return {
       "aria-multiselectable": true,