diff --git a/src/action-handler-directive.ts b/src/action-handler-directive.ts
index cd2d1c3a..25fcd421 100644
--- a/src/action-handler-directive.ts
+++ b/src/action-handler-directive.ts
@@ -142,10 +142,9 @@ class ActionHandler extends HTMLElement implements ActionHandler {
     };
 
     const handleEnter = (ev: KeyboardEvent): void => {
-      if (ev.keyCode !== 13) {
-        return;
+      if (ev.key === 'Enter') {
+        end(ev);
       }
-      end(ev);
     };
 
     element.addEventListener('touchstart', start, { passive: true });
@@ -153,9 +152,11 @@ class ActionHandler extends HTMLElement implements ActionHandler {
     element.addEventListener('touchcancel', end);
 
     element.addEventListener('mousedown', start, { passive: true });
-    element.addEventListener('pointerdown', start, { passive: true });
     element.addEventListener('click', end);
 
+    // For the timeline which generates native pointer events.
+    element.addEventListener('pointerdown', start, { passive: true });
+
     element.addEventListener('keyup', handleEnter);
   }
 }