| Index: lib/options.js | 
| =================================================================== | 
| --- a/lib/options.js | 
| +++ b/lib/options.js | 
| @@ -185,11 +185,14 @@ | 
| // [1] - https://bugzilla.mozilla.org/show_bug.cgi?id=1414613 | 
| if ("getBrowserInfo" in browser.runtime) | 
| { | 
| -  browser.runtime.getBrowserInfo().then(browserInfo => | 
| -  { | 
| -    if (browserInfo.name == "Fennec") | 
| -      browser.browserAction.setPopup({popup: ""}); | 
| -  }); | 
| +  Promise.all([browser.browserAction.getPopup({}), | 
| +               browser.runtime.getBrowserInfo()]).then( | 
| +    ([popup, browserInfo]) => | 
| +    { | 
| +      if (!popup && browserInfo.name != "Fennec") | 
| +        browser.browserAction.setPopup({popup: "popup.html"}); | 
| +    } | 
| +  ); | 
| } | 
|  | 
| // On Firefox for Android, open the options page directly when the browser | 
|  |