diff --git a/manage/manage.js b/manage/manage.js
index 455a9029..adfaa945 100644
--- a/manage/manage.js
+++ b/manage/manage.js
@@ -706,13 +706,14 @@ function highlightEditedStyle() {
 
 
 function embedOptions() {
-  const options = $('#stylus-embedded-options');
+  let options = $('#stylus-embedded-options');
   if (!options) {
-    const iframe = document.createElement('iframe');
-    iframe.id = 'stylus-embedded-options';
-    iframe.src = '/options.html';
-    document.documentElement.appendChild(iframe);
+    options = document.createElement('iframe');
+    options.id = 'stylus-embedded-options';
+    options.src = '/options.html';
+    document.documentElement.appendChild(options);
   }
+  options.focus();
 }
 
 function unembedOptions() {
diff --git a/options/options.js b/options/options.js
index 2a849146..ea4170b2 100644
--- a/options/options.js
+++ b/options/options.js
@@ -302,8 +302,3 @@ window.onkeydown = event => {
     top.dispatchEvent(new CustomEvent('closeOptions'));
   }
 };
-
-// FF is slow to allow focus, particularly when launched via manager button
-setTimeout(() => {
-  window.focus();
-}, 100);