diff --git a/public/popup.html b/public/popup.html
index fae41356..0ebd5e2b 100644
--- a/public/popup.html
+++ b/public/popup.html
@@ -8,7 +8,7 @@
     <link id="sponsorBlockStyleSheet" href="popup.css" rel="stylesheet">
   </head>
 
-  <body id="sponsorBlockPopupBody">
+  <body id="sponsorBlockPopupBody" style="visibility: hidden">
     <div id="sponsorblockPopup" class="sponsorBlockPageBody sb-preload">
 
       <button id="sbCloseButton" title="__MSG_closePopup__" class="sbCloseButton">
diff --git a/src/content.ts b/src/content.ts
index e9f800bc..75f16766 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -1694,7 +1694,7 @@ function openInfoMenu() {
     const frame = document.createElement("iframe");
     frame.width = "374";
     frame.height = "500";
-    frame.onload = () => frame.contentWindow.postMessage("", "*");
+    frame.addEventListener("load", () => frame.contentWindow.postMessage("", "*"));
     frame.src = chrome.extension.getURL("popup.html");
     popup.appendChild(frame);
 
diff --git a/src/help.ts b/src/help.ts
index 6f3945df..9cc6b4bd 100644
--- a/src/help.ts
+++ b/src/help.ts
@@ -1,15 +1,15 @@
 import Config from "./config";
 import { showDonationLink } from "./utils/configUtils";
 
-import Utils from "./utils";
-const utils = new Utils();
+import { localizeHtmlPage } from "./utils/pageUtils";
+import { GenericUtils } from "./utils/genericUtils";
 
 window.addEventListener('DOMContentLoaded', init);
 
 async function init() {
-    utils.localizeHtmlPage();
+    localizeHtmlPage();
 
-    await utils.wait(() => Config.config !== null);
+    await GenericUtils.wait(() => Config.config !== null);
 
     if (!Config.config.darkMode) {
         document.documentElement.setAttribute("data-theme", "light");
diff --git a/src/options.ts b/src/options.ts
index a1ddc234..8d074e38 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -12,13 +12,14 @@ import Utils from "./utils";
 import CategoryChooser from "./render/CategoryChooser";
 import KeybindComponent from "./components/KeybindComponent";
 import { showDonationLink } from "./utils/configUtils";
+import { localizeHtmlPage } from "./utils/pageUtils";
 const utils = new Utils();
 let embed = false;
 
 window.addEventListener('DOMContentLoaded', init);
 
 async function init() {
-    utils.localizeHtmlPage();
+    localizeHtmlPage();
 
     // selected tab
     if (location.hash != "") {
diff --git a/src/permissions.ts b/src/permissions.ts
index 558f0c3f..05da496e 100644
--- a/src/permissions.ts
+++ b/src/permissions.ts
@@ -1,5 +1,6 @@
 import Config from "./config";
 import Utils from "./utils";
+import { localizeHtmlPage } from "./utils/pageUtils";
 const utils = new Utils();
 
 // This is needed, if Config is not imported before Utils, things break.
@@ -9,7 +10,7 @@ Config.config;
 window.addEventListener('DOMContentLoaded', init);
 
 async function init() {
-    utils.localizeHtmlPage();
+    localizeHtmlPage();
 
     const domains = document.location.hash.replace("#", "").split(",");
 
diff --git a/src/popup.ts b/src/popup.ts
index 34a9d69f..40f70bab 100644
--- a/src/popup.ts
+++ b/src/popup.ts
@@ -6,6 +6,7 @@ import { Message, MessageResponse, IsInfoFoundMessageResponse } from "./messageT
 import { showDonationLink } from "./utils/configUtils";
 import { AnimationUtils } from "./utils/animationUtils";
 import { GenericUtils } from "./utils/genericUtils";
+import { localizeHtmlPage } from "./utils/pageUtils";
 const utils = new Utils();
 
 interface MessageListener {
@@ -43,25 +44,20 @@ class MessageHandler {
     }
 }
 
-let allowPopup = (window === window.top);
-
 // To prevent clickjacking
-window.onmessage = async e => {
-    if (e.source !== window.parent) return
+let allowPopup = window === window.top;
+window.addEventListener("message", async (e) => {
+    if (e.source !== window.parent) return;
     if (e.origin.endsWith('.youtube.com')) return allowPopup = true;
-    await utils.wait(() => Config.config !== null);
-    if (Config.config.supportInvidious && e.origin.includes(Config.config.invidiousInstances)) return allowPopup = true;
-}
+});
 
 //make this a function to allow this to run on the content page
 async function runThePopup(messageListener?: MessageListener): Promise<void> {
-    if (window !== window.top) await utils.wait(() => allowPopup === true);
-    
     const messageHandler = new MessageHandler(messageListener);
+    localizeHtmlPage();
 
-    utils.localizeHtmlPage();
-
-    await utils.wait(() => Config.config !== null);
+    await utils.wait(() => Config.config !== null && allowPopup === true, 5000, 5);
+    document.querySelector("body").style.removeProperty("visibility");
 
     type InputPageElements = {
         whitelistToggle?: HTMLInputElement,
diff --git a/src/utils.ts b/src/utils.ts
index d89e1a3d..f72f4dd0 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -256,31 +256,6 @@ export default class Utils {
         }
     }
 
-    localizeHtmlPage(): void {
-        //Localize by replacing __MSG_***__ meta tags
-        const localizedMessage = this.getLocalizedMessage(document.title);
-        if (localizedMessage) document.title = localizedMessage;
-        const objects = document.getElementsByClassName("sponsorBlockPageBody")[0].children;
-        for (let j = 0; j < objects.length; j++) {
-            const obj = objects[j];
-            const localizedMessage = this.getLocalizedMessage(obj.innerHTML.toString());
-            if (localizedMessage) obj.innerHTML = localizedMessage;
-        }
-    }
-
-    getLocalizedMessage(text: string): string | false {
-        const valNewH = text.replace(/__MSG_(\w+)__/g, function(match, v1) {
-            return v1 ? chrome.i18n.getMessage(v1).replace(/</g, "&#60;")
-                .replace(/"/g, "&quot;").replace(/\n/g, "<br/>") : "";
-        });
-
-        if(valNewH != text) {
-            return valNewH;
-        } else {
-            return false;
-        }
-    }
-
     /**
      * @returns {String[]} Domains in regex form
      */
diff --git a/src/utils/pageUtils.ts b/src/utils/pageUtils.ts
index 8f484d73..2cd07b87 100644
--- a/src/utils/pageUtils.ts
+++ b/src/utils/pageUtils.ts
@@ -61,4 +61,29 @@ export function getHashParams(): Record<string, unknown> {
     }
 
     return {};
+}
+
+export function localizeHtmlPage(): void {
+    //Localize by replacing __MSG_***__ meta tags
+    const localizedMessage = getLocalizedMessage(document.title);
+    if (localizedMessage) document.title = localizedMessage;
+    const objects = document.getElementsByClassName("sponsorBlockPageBody")[0].children;
+    for (let j = 0; j < objects.length; j++) {
+        const obj = objects[j];
+        const localizedMessage = getLocalizedMessage(obj.innerHTML.toString());
+        if (localizedMessage) obj.innerHTML = localizedMessage;
+    }
+}
+
+export function getLocalizedMessage(text: string): string | false {
+    const valNewH = text.replace(/__MSG_(\w+)__/g, function(match, v1) {
+        return v1 ? chrome.i18n.getMessage(v1).replace(/</g, "&#60;")
+            .replace(/"/g, "&quot;").replace(/\n/g, "<br/>") : "";
+    });
+
+    if (valNewH != text) {
+        return valNewH;
+    } else {
+        return false;
+    }
 }
\ No newline at end of file
