7 files changed, 26 insertions, 8 deletions
diff --git a/ext/bg/js/generic-page-main.js b/ext/bg/js/generic-page-main.js
index 8e1b3c76..29fcf63d 100644
--- a/ext/bg/js/generic-page-main.js
+++ b/ext/bg/js/generic-page-main.js
@@ -15,13 +15,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/* global
+ * DocumentFocusController
+ */
+
 function setupEnvironmentInfo() {
     const {manifest_version: manifestVersion} = chrome.runtime.getManifest();
     document.documentElement.dataset.manifestVersion = `${manifestVersion}`;
 }
 
 (() => {
-    document.querySelector('#content-scroll-focus').focus();
+    const documentFocusController = new DocumentFocusController();
+    documentFocusController.prepare();
     document.documentElement.dataset.loaded = 'true';
     setupEnvironmentInfo();
 })();
diff --git a/ext/bg/js/info-main.js b/ext/bg/js/info-main.js
index 58e9d3b7..71cfdbd8 100644
--- a/ext/bg/js/info-main.js
+++ b/ext/bg/js/info-main.js
@@ -17,6 +17,7 @@
 
 /* global
  * BackupController
+ * DocumentFocusController
  * SettingsController
  * api
  */
@@ -47,7 +48,8 @@ function getOperatingSystemDisplayName(os) {
 
 (async () => {
     try {
-        document.querySelector('#content-scroll-focus').focus();
+        const documentFocusController = new DocumentFocusController();
+        documentFocusController.prepare();
 
         const manifest = chrome.runtime.getManifest();
         const language = chrome.i18n.getUILanguage();
diff --git a/ext/bg/js/permissions-main.js b/ext/bg/js/permissions-main.js
index a464f40e..b1c0430e 100644
--- a/ext/bg/js/permissions-main.js
+++ b/ext/bg/js/permissions-main.js
@@ -16,6 +16,7 @@
  */
 
 /* global
+ * DocumentFocusController
  * api
  */
 
@@ -52,7 +53,9 @@ async function setPermissionsGranted(permissions, shouldHave) {
 
 (async () => {
     try {
-        document.querySelector('#content-scroll-focus').focus();
+        const documentFocusController = new DocumentFocusController();
+        documentFocusController.prepare();
+
         document.querySelector('#extension-id-example').textContent = chrome.runtime.getURL('/');
 
         api.forwardLogsToBackend();
diff --git a/ext/bg/js/search-main.js b/ext/bg/js/search-main.js
index f98028b3..4bcf14e8 100644
--- a/ext/bg/js/search-main.js
+++ b/ext/bg/js/search-main.js
@@ -17,6 +17,7 @@
 
 /* global
  * DisplaySearch
+ * DocumentFocusController
  * JapaneseUtil
  * api
  * wanakana
@@ -24,11 +25,14 @@
 
 (async () => {
     try {
+        const documentFocusController = new DocumentFocusController();
+        documentFocusController.prepare();
+
         api.forwardLogsToBackend();
         await yomichan.backendReady();
 
         const japaneseUtil = new JapaneseUtil(wanakana);
-        const displaySearch = new DisplaySearch(japaneseUtil);
+        const displaySearch = new DisplaySearch(japaneseUtil, documentFocusController);
         await displaySearch.prepare();
 
         document.documentElement.dataset.loaded = 'true';
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 884ab33c..fb8757eb 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -24,8 +24,8 @@
  */
 
 class DisplaySearch extends Display {
-    constructor(japaneseUtil) {
-        super('search', japaneseUtil);
+    constructor(japaneseUtil, documentFocusController) {
+        super('search', japaneseUtil, documentFocusController);
         this._searchButton = document.querySelector('#search-button');
         this._queryInput = document.querySelector('#search-textbox');
         this._introElement = document.querySelector('#intro');
diff --git a/ext/bg/js/settings2/settings-main.js b/ext/bg/js/settings2/settings-main.js
index 6e6186e5..162ed3cd 100644
--- a/ext/bg/js/settings2/settings-main.js
+++ b/ext/bg/js/settings2/settings-main.js
@@ -23,6 +23,7 @@
  * ClipboardPopupsController
  * DictionaryController
  * DictionaryImportController
+ * DocumentFocusController
  * GenericSettingController
  * ModalController
  * NestedPopupsController
@@ -53,7 +54,8 @@ async function setupGenericSettingsController(genericSettingController) {
 
 (async () => {
     try {
-        document.querySelector('#content-scroll-focus').focus();
+        const documentFocusController = new DocumentFocusController();
+        documentFocusController.prepare();
 
         const statusFooter = new StatusFooter(document.querySelector('.status-footer-container'));
         statusFooter.prepare();
diff --git a/ext/bg/js/welcome-main.js b/ext/bg/js/welcome-main.js
index 8d43fdb0..cbc7e2f8 100644
--- a/ext/bg/js/welcome-main.js
+++ b/ext/bg/js/welcome-main.js
@@ -18,6 +18,7 @@
 /* global
  * DictionaryController
  * DictionaryImportController
+ * DocumentFocusController
  * GenericSettingController
  * ModalController
  * ScanInputsSimpleController
@@ -42,7 +43,8 @@ async function setupGenericSettingsController(genericSettingController) {
 
 (async () => {
     try {
-        document.querySelector('#content-scroll-focus').focus();
+        const documentFocusController = new DocumentFocusController();
+        documentFocusController.prepare();
 
         const statusFooter = new StatusFooter(document.querySelector('.status-footer-container'));
         statusFooter.prepare();