diff --git a/manifest.json b/manifest.json
index a24e5b76..f758fd91 100644
--- a/manifest.json
+++ b/manifest.json
@@ -69,6 +69,9 @@
     "128": "icons/LogoSponsorBlocker128px.png",
     "256": "icons/LogoSponsorBlocker256px.png"
   },
-  "options_page": "options/options.html",
+  "options_ui": {
+    "page": "options/options.html",
+    "open_in_tab": true
+  },
   "manifest_version": 2
 }
diff --git a/options/options.css b/options/options.css
index e67d956c..16746d01 100644
--- a/options/options.css
+++ b/options/options.css
@@ -42,7 +42,7 @@ body {
     border-radius: 5px;
     font-size: 14px;
 
-    width: fit-content;
+    width: max-content;
 }
 
 .option-button:hover {
diff --git a/options/options.js b/options/options.js
index eb67d535..2424bae6 100644
--- a/options/options.js
+++ b/options/options.js
@@ -64,7 +64,10 @@ async function init() {
         }
     }
 
-    await wait(() => checksLeft == 0, 1000, 50);
+    // Don't wait on chrome
+    if (typeof(browser) == "undefined") {
+        await wait(() => checksLeft == 0, 1000, 50);
+    }
 
     optionsContainer.classList.remove("hidden");
     optionsContainer.classList.add("animated");