diff --git a/src/drivers/webextension/js/popup.js b/src/drivers/webextension/js/popup.js
index 6c4ed2781..fe2ed174a 100644
--- a/src/drivers/webextension/js/popup.js
+++ b/src/drivers/webextension/js/popup.js
@@ -243,39 +243,40 @@ const Popup = {
 
     const el = {
       body: document.body,
-      terms: document.querySelector('.terms'),
       detections: document.querySelector('.detections'),
-      playGame: document.querySelector('.empty__play-game'),
-      game: document.querySelector('.ttt-game'),
+      empty: document.querySelector('.empty'),
       footer: document.querySelector('.footer'),
-      tabPlus: document.querySelector('.tab--plus'),
-      termsButtonAccept: document.querySelector('.terms__button--accept'),
-      termsButtonDecline: document.querySelector('.terms__button--decline'),
-      headerSwitches: document.querySelectorAll('.header__switch'),
-      headerSwitchEnabled: document.querySelector('.header__switch--enabled'),
+      game: document.querySelector('.ttt-game'),
       headerSwitchDisabled: document.querySelector('.header__switch--disabled'),
-      plusConfigureApiKey: document.querySelector('.plus-configure__apikey'),
-      plusConfigureSave: document.querySelector('.plus-configure__save'),
-      plusDownload: document.querySelector('.plus-download'),
+      headerSwitchEnabled: document.querySelector('.header__switch--enabled'),
+      headerSwitches: document.querySelectorAll('.header__switch'),
       plusDownloadLink: document.querySelector(
         '.plus-download__button .button__link'
       ),
-      headerSettings: document.querySelector('.header__settings'),
-      headerThemes: document.querySelectorAll('.header__theme'),
-      headerThemeLight: document.querySelector('.header__theme--light'),
-      headerThemeDark: document.querySelector('.header__theme--dark'),
-      templates: document.querySelectorAll('[data-template]'),
-      tabs: document.querySelectorAll('.tab'),
-      tabItems: document.querySelectorAll('.tab-item'),
+      playGame: document.querySelector('.empty__play-game'),
+      plusConfigureApiKey: document.querySelector('.plus-configure__apikey'),
+      plusConfigureSave: document.querySelector('.plus-configure__save'),
+      plusDownload: document.querySelector('.plus-download'),
+      tabPlus: document.querySelector('.tab--plus'),
+      terms: document.querySelector('.terms'),
+      termsButtonAccept: document.querySelector('.terms__button--accept'),
+      termsButtonDecline: document.querySelector('.terms__button--decline'),
       credits: document.querySelector('.credits'),
-      issue: document.querySelector('.issue'),
-      footerHeadingText: document.querySelector('.footer__heading-text'),
-      footerContentBody: document.querySelector('.footer__content-body'),
-      footerButtonText: document.querySelector('.footer .button__text'),
       footerButtonLink: document.querySelector('.footer .button__link'),
+      footerButtonText: document.querySelector('.footer .button__text'),
+      footerContentBody: document.querySelector('.footer__content-body'),
+      footerHeading: document.querySelector('.footer__heading'),
+      footerHeadingText: document.querySelector('.footer__heading-text'),
       footerToggleClose: document.querySelector('.footer__toggle--close'),
       footerToggleOpen: document.querySelector('.footer__toggle--open'),
-      footerHeading: document.querySelector('.footer__heading'),
+      headerSettings: document.querySelector('.header__settings'),
+      headerThemeDark: document.querySelector('.header__theme--dark'),
+      headerThemeLight: document.querySelector('.header__theme--light'),
+      headerThemes: document.querySelectorAll('.header__theme'),
+      issue: document.querySelector('.issue'),
+      tabItems: document.querySelectorAll('.tab-item'),
+      tabs: document.querySelectorAll('.tab'),
+      templates: document.querySelectorAll('[data-template]'),
     }
 
     // Templates