diff --git a/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.ts b/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.ts
index 7aade93..e383811 100644
--- a/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.ts
+++ b/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.ts
@@ -841,9 +841,10 @@
         ) {
           return true;
         }
-        for (let i = 0; e.path && i < e.path.length; i++) {
+        const path = e.composedPath();
+        for (let i = 0; path && i < path.length; i++) {
           // TODO(TS): narrow this down to Element from EventTarget first
-          if ((e.path[i] as Element).tagName === 'GR-OVERLAY') {
+          if ((path[i] as Element).tagName === 'GR-OVERLAY') {
             return true;
           }
         }