diff --git a/frontend/src/Search/SearchIndex.js b/frontend/src/Search/SearchIndex.js
index f7524122f..012dc48da 100644
--- a/frontend/src/Search/SearchIndex.js
+++ b/frontend/src/Search/SearchIndex.js
@@ -84,6 +84,10 @@ class SearchIndex extends Component {
     }
   }
 
+  componentWillUnmount() {
+    window.removeEventListener('keyup', this.onKeyUp);
+  }
+
   //
   // Control
 
@@ -192,7 +196,8 @@ class SearchIndex extends Component {
 
   onKeyUp = (event) => {
     const jumpBarItems = this.state.jumpBarItems.order;
-    if (event.path.length === 4) {
+
+    if (event.composedPath && event.composedPath().length === 4) {
       if (event.keyCode === keyCodes.HOME && event.ctrlKey) {
         this.setState({ jumpToCharacter: jumpBarItems[0] });
       }