diff --git a/scripts/nonumpad.user.js b/scripts/nonumpad.user.js
index a47f3e2..335ed13 100644
--- a/scripts/nonumpad.user.js
+++ b/scripts/nonumpad.user.js
@@ -1,8 +1,9 @@
 // ==UserScript==
 // @name         No youtube numpad
-// @match        https://www.youtube.com/watch*
+// @match        https://www.youtube.com/*
 // @author       Stabosa87
 // @grant        none
+// @run-at       document-start
 // ==/UserScript==
 
 (function () {
@@ -19,10 +20,11 @@
         if (!el) return false;
 
         const tag = el.tagName;
-        if (tag === 'INPUT' || tag === 'TEXTAREA') return true;
-        if (el.isContentEditable) return true;
-
-        return false;
+        return (
+            tag === 'INPUT' ||
+            tag === 'TEXTAREA' ||
+            el.isContentEditable
+        );
     }
 
     function handler(e) {
@@ -30,7 +32,6 @@
         if (typing(document.activeElement)) return;
 
         e.preventDefault();
-        e.stopPropagation();
         e.stopImmediatePropagation();
     }