diff --git a/package-lock.json b/package-lock.json
index 8597b8fe..3d92bea9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -108,7 +108,7 @@
                 "css-loader": "^6.7.1",
                 "css-minimizer-webpack-plugin": "^3.4.1",
                 "detect-port": "^1.3.0",
-                "electron": "^33.3.1",
+                "electron": "^36.1.0",
                 "electron-builder": "^24.13.3",
                 "electron-devtools-installer": "^3.2.0",
                 "electron-notarize": "^1.2.1",
@@ -8928,15 +8928,15 @@
             }
         },
         "node_modules/electron": {
-            "version": "33.4.10",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-33.4.10.tgz",
-            "integrity": "sha512-K1QvMoKnrlrZATShVuh3bZEAT7DNiNQ4jLqbgbd37R/OQCuWPQ1o0lXbAl2NnkU9dCCjtZujYIsF+NVmMX/h+g==",
+            "version": "36.1.0",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-36.1.0.tgz",
+            "integrity": "sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
             "dependencies": {
                 "@electron/get": "^2.0.0",
-                "@types/node": "^20.9.0",
+                "@types/node": "^22.7.7",
                 "extract-zip": "^2.0.1"
             },
             "bin": {
@@ -9129,13 +9129,13 @@
             }
         },
         "node_modules/electron/node_modules/@types/node": {
-            "version": "20.17.31",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.31.tgz",
-            "integrity": "sha512-quODOCNXQAbNf1Q7V+fI8WyErOCh0D5Yd31vHnKu4GkSztGQ7rlltAaqXhHhLl33tlVyUXs2386MkANSwgDn6A==",
+            "version": "22.15.12",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.12.tgz",
+            "integrity": "sha512-K0fpC/ZVeb8G9rm7bH7vI0KAec4XHEhBam616nVJCV51bKzJ6oA3luG4WdKoaztxe70QaNjS/xBmcDLmr4PiGw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "undici-types": "~6.19.2"
+                "undici-types": "~6.21.0"
             }
         },
         "node_modules/electronmon": {
@@ -22797,9 +22797,9 @@
             }
         },
         "node_modules/undici-types": {
-            "version": "6.19.8",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-            "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
             "dev": true,
             "license": "MIT"
         },
@@ -30318,23 +30318,23 @@
             }
         },
         "electron": {
-            "version": "33.4.10",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-33.4.10.tgz",
-            "integrity": "sha512-K1QvMoKnrlrZATShVuh3bZEAT7DNiNQ4jLqbgbd37R/OQCuWPQ1o0lXbAl2NnkU9dCCjtZujYIsF+NVmMX/h+g==",
+            "version": "36.1.0",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-36.1.0.tgz",
+            "integrity": "sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg==",
             "dev": true,
             "requires": {
                 "@electron/get": "^2.0.0",
-                "@types/node": "^20.9.0",
+                "@types/node": "^22.7.7",
                 "extract-zip": "^2.0.1"
             },
             "dependencies": {
                 "@types/node": {
-                    "version": "20.17.31",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.31.tgz",
-                    "integrity": "sha512-quODOCNXQAbNf1Q7V+fI8WyErOCh0D5Yd31vHnKu4GkSztGQ7rlltAaqXhHhLl33tlVyUXs2386MkANSwgDn6A==",
+                    "version": "22.15.12",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.12.tgz",
+                    "integrity": "sha512-K0fpC/ZVeb8G9rm7bH7vI0KAec4XHEhBam616nVJCV51bKzJ6oA3luG4WdKoaztxe70QaNjS/xBmcDLmr4PiGw==",
                     "dev": true,
                     "requires": {
-                        "undici-types": "~6.19.2"
+                        "undici-types": "~6.21.0"
                     }
                 }
             }
@@ -39707,9 +39707,9 @@
             "integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ=="
         },
         "undici-types": {
-            "version": "6.19.8",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-            "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
             "dev": true
         },
         "unique-filename": {
diff --git a/package.json b/package.json
index c250defd..ceee6ecc 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
             "package.json"
         ],
         "afterSign": ".erb/scripts/notarize.js",
-        "electronVersion": "33.3.1",
+        "electronVersion": "36.1.0",
         "mac": {
             "target": {
                 "target": "default",
@@ -234,7 +234,7 @@
         "css-loader": "^6.7.1",
         "css-minimizer-webpack-plugin": "^3.4.1",
         "detect-port": "^1.3.0",
-        "electron": "^33.3.1",
+        "electron": "^36.1.0",
         "electron-builder": "^24.13.3",
         "electron-devtools-installer": "^3.2.0",
         "electron-notarize": "^1.2.1",
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 055b5756..2dd21b2c 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -15,7 +15,7 @@
                 "ws": "^8.18.0"
             },
             "devDependencies": {
-                "electron": "31.1.0"
+                "electron": "36.1.0"
             }
         },
         "node_modules/@electron/get": {
@@ -99,12 +99,13 @@
             }
         },
         "node_modules/@types/node": {
-            "version": "20.14.9",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz",
-            "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==",
+            "version": "22.15.12",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.12.tgz",
+            "integrity": "sha512-K0fpC/ZVeb8G9rm7bH7vI0KAec4XHEhBam616nVJCV51bKzJ6oA3luG4WdKoaztxe70QaNjS/xBmcDLmr4PiGw==",
             "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "undici-types": "~5.26.4"
+                "undici-types": "~6.21.0"
             }
         },
         "node_modules/@types/responselike": {
@@ -456,14 +457,15 @@
             "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
         },
         "node_modules/electron": {
-            "version": "31.1.0",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-31.1.0.tgz",
-            "integrity": "sha512-TBOwqLxSxnx6+pH6GMri7R3JPH2AkuGJHfWZS0p1HsmN+Qr1T9b0IRJnnehSd/3NZAmAre4ft9Ljec7zjyKFJA==",
+            "version": "36.1.0",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-36.1.0.tgz",
+            "integrity": "sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg==",
             "dev": true,
             "hasInstallScript": true,
+            "license": "MIT",
             "dependencies": {
                 "@electron/get": "^2.0.0",
-                "@types/node": "^20.9.0",
+                "@types/node": "^22.7.7",
                 "extract-zip": "^2.0.1"
             },
             "bin": {
@@ -1274,10 +1276,11 @@
             }
         },
         "node_modules/undici-types": {
-            "version": "5.26.5",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-            "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-            "dev": true
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/universalify": {
             "version": "0.1.2",
@@ -1417,12 +1420,12 @@
             }
         },
         "@types/node": {
-            "version": "20.14.9",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz",
-            "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==",
+            "version": "22.15.12",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.12.tgz",
+            "integrity": "sha512-K0fpC/ZVeb8G9rm7bH7vI0KAec4XHEhBam616nVJCV51bKzJ6oA3luG4WdKoaztxe70QaNjS/xBmcDLmr4PiGw==",
             "dev": true,
             "requires": {
-                "undici-types": "~5.26.4"
+                "undici-types": "~6.21.0"
             }
         },
         "@types/responselike": {
@@ -1684,13 +1687,13 @@
             "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
         },
         "electron": {
-            "version": "31.1.0",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-31.1.0.tgz",
-            "integrity": "sha512-TBOwqLxSxnx6+pH6GMri7R3JPH2AkuGJHfWZS0p1HsmN+Qr1T9b0IRJnnehSd/3NZAmAre4ft9Ljec7zjyKFJA==",
+            "version": "36.1.0",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-36.1.0.tgz",
+            "integrity": "sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg==",
             "dev": true,
             "requires": {
                 "@electron/get": "^2.0.0",
-                "@types/node": "^20.9.0",
+                "@types/node": "^22.7.7",
                 "extract-zip": "^2.0.1"
             }
         },
@@ -2291,9 +2294,9 @@
             "optional": true
         },
         "undici-types": {
-            "version": "5.26.5",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-            "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+            "version": "6.21.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
             "dev": true
         },
         "universalify": {
diff --git a/release/app/package.json b/release/app/package.json
index dced2831..50a5d673 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -18,7 +18,7 @@
         "ws": "^8.18.0"
     },
     "devDependencies": {
-        "electron": "31.1.0"
+        "electron": "36.1.0"
     },
     "license": "GPL-3.0"
 }