diff --git a/src/hemsedal24/components/Popover.tsx b/src/hemsedal24/components/Popover.tsx
index 370b339e6..01615265e 100644
--- a/src/hemsedal24/components/Popover.tsx
+++ b/src/hemsedal24/components/Popover.tsx
@@ -23,17 +23,16 @@ const Popover: React.FC<PopoverProps> = ({ onClose, children }) => {
     };
   }, [onClose]);
 
-  const handleKeyDown = (event: KeyboardEvent) => {
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
     if (event.key === 'Escape' || event.key === 'Enter') {
       if (popoverRef.current && !popoverRef.current.contains(event.target as Node)) {
       onClose();
     }}
   };
-  document.addEventListener('keydown', handleKeyDown);
 
   return (
     <>
-      <div className={styles.backdrop} onClick={onClose} tabIndex={0} role='button' aria-label="Close popover">  </div>  
+      <div className={styles.backdrop} onClick={onClose} onKeyDown={handleKeyDown} tabIndex={0} role='button' aria-label="Close popover">  </div>  
       <div ref={popoverRef} className={styles.popover_content}>
         {children}
       </div>