--- a/browser/components/extensions/test/browser/browser_ext_user_events.js
+++ b/browser/components/extensions/test/browser/browser_ext_user_events.js
@@ -85,39 +85,42 @@ add_task(async function testSources() {
           <a id="link" href="#">Link</a>
         </body>
         </html>`,
 
       "options.js"() {
         addEventListener("load", async () => {
           let link = document.getElementById("link");
           link.onclick = async event => {
+            link.onclick = null;
             event.preventDefault();
 
+            browser.test.log("Calling permission.request from options page.");
+
             try {
               let result = await browser.permissions.request({
                 permissions: ["webRequest"],
               });
               browser.test.sendMessage("request", {success: true, result});
             } catch (err) {
               browser.test.sendMessage("request", {success: false, errmsg: err.message});
             }
           };
 
           // Make a few trips through the event loop to make sure the
           // options browser is fully visible. This is a bit dodgy, but
           // we don't really have a reliable way to detect this from the
           // options page side, and synthetic click events won't work
           // until it is.
-          for (let i = 0; i < 10; i++) {
+          do {
+            browser.test.log("Waiting for the options browser to be visible...");
             await new Promise(resolve => setTimeout(resolve, 0));
-          }
-
-          synthesizeMouseAtCenter(link, {});
-        }, {once: true});
+            synthesizeMouseAtCenter(link, {});
+          } while (link.onclick !== null);
+        });
       },
     },
 
     manifest: {
       browser_action: {default_title: "test"},
       page_action: {default_title: "test"},
       permissions: ["contextMenus"],
       optional_permissions: ["bookmarks", "tabs", "webNavigation", "webRequest", "cookies"],
@@ -170,20 +173,20 @@ add_task(async function testSources() {
   extension.sendMessage("contextMenus.update");
   await extension.awaitMessage("contextMenus.update-done");
   menu = await openContextMenu("body");
   items = menu.getElementsByAttribute("label", "test user events in onClicked");
   is(items.length, 1, "Found context menu item again");
   EventUtils.synthesizeMouseAtCenter(items[0], {});
   await check("context menu in onClicked");
 
-  extension.sendMessage("openOptionsPage");
   promisePopupNotificationShown("addon-webext-permissions").then(panel => {
     panel.button.click();
   });
+  extension.sendMessage("openOptionsPage");
   await check("options page link click");
 
   await BrowserTestUtils.removeTab(gBrowser.selectedTab);
   await BrowserTestUtils.removeTab(tab);
 
   await extension.unload();
 
   registerCleanupFunction(() => CustomizableUI.reset());