diff --git a/src/js/components/hooks/useDoubleClick.js b/src/js/components/hooks/useDoubleClick.js
index b8f23ba211..59df12384b 100644
--- a/src/js/components/hooks/useDoubleClick.js
+++ b/src/js/components/hooks/useDoubleClick.js
@@ -26,7 +26,8 @@ export default function useDoubleClick(
     return () => clearTimeout(singleClickTimer)
   }, [clicks])
 
-  return (e: MouseEvent) => {
+  return (e: SyntheticEvent<HTMLElement>) => {
+    e.persist()
     setEvent(e)
     setClicks((clicks) => clicks + 1)
   }
diff --git a/src/js/components/useSearchShortcuts.js b/src/js/components/useSearchShortcuts.js
index 9574670d14..491925ee71 100644
--- a/src/js/components/useSearchShortcuts.js
+++ b/src/js/components/useSearchShortcuts.js
@@ -10,7 +10,9 @@ import Tabs from "../state/Tabs"
 export default function() {
   let dispatch = useDispatch()
   useEffect(() => {
-    const bindings = new Mousetrap()
+    const el = document.documentElement
+    if (!el) throw new Error("No Document Element")
+    const bindings = new Mousetrap(el)
       .bind("mod+t", () => dispatch(Tabs.new()))
       .bind("mod+w", (e) => {
         e.preventDefault()