diff --git a/src/services/window.js b/src/services/window.js
index a64af52d3..bcc259bd7 100644
--- a/src/services/window.js
+++ b/src/services/window.js
@@ -59,6 +59,7 @@ async function createMainWindow() {
         height: mainWindowState.height,
         title: 'Trilium Notes',
         webPreferences: {
+            enableRemoteModule: true,
             nodeIntegration: true,
             contextIsolation: false,
             spellcheck: spellcheckEnabled
diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs
index ca45a1beb..bdf73d471 100644
--- a/src/views/desktop.ejs
+++ b/src/views/desktop.ejs
@@ -41,6 +41,8 @@
 <%- include('dialogs/delete_notes.ejs') %>
 
 <script type="text/javascript">
+    global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
+
     window.baseApiUrl = 'api/';
     window.device = "desktop";
     window.glob = {
diff --git a/src/views/mobile.ejs b/src/views/mobile.ejs
index ea47ffd36..f9153adec 100644
--- a/src/views/mobile.ejs
+++ b/src/views/mobile.ejs
@@ -105,6 +105,8 @@
 <%- include('dialogs/confirm.ejs') %>
 
 <script type="text/javascript">
+    global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
+
     window.baseApiUrl = 'api/';
     window.device = "mobile";
     window.glob = {
diff --git a/src/views/setup.ejs b/src/views/setup.ejs
index d85b0f868..723b281f6 100644
--- a/src/views/setup.ejs
+++ b/src/views/setup.ejs
@@ -189,6 +189,8 @@
 </div>
 
 <script type="text/javascript">
+    global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
+
     window.glob = {
         sourceId: ''
     };
diff --git a/webpack-desktop.config.js b/webpack-desktop.config.js
index 0742af928..3a3ab7b0e 100644
--- a/webpack-desktop.config.js
+++ b/webpack-desktop.config.js
@@ -11,5 +11,5 @@ module.exports = {
         filename: 'desktop.js'
     },
     devtool: 'source-map',
-    target: 'electron-main'
+    target: 'electron-renderer'
 };
diff --git a/webpack-mobile.config.js b/webpack-mobile.config.js
index d96c99e28..a60133980 100644
--- a/webpack-mobile.config.js
+++ b/webpack-mobile.config.js
@@ -11,5 +11,5 @@ module.exports = {
         filename: 'mobile.js'
     },
     devtool: 'source-map',
-    target: 'electron-main'
+    target: 'electron-renderer'
 };
diff --git a/webpack-setup.config.js b/webpack-setup.config.js
index 01cb70d41..c7ec8f349 100644
--- a/webpack-setup.config.js
+++ b/webpack-setup.config.js
@@ -11,5 +11,5 @@ module.exports = {
         filename: 'setup.js'
     },
     devtool: 'source-map',
-    target: 'electron-main'
+    target: 'electron-renderer'
 };