diff --git a/.yarnrc b/.yarnrc
index 92a2a8bc8c2..b0814477f16 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,5 +1,5 @@
 disturl "https://electronjs.org/headers"
-target "25.8.2"
-ms_build_id "23977753"
+target "25.8.4"
+ms_build_id "24154031"
 runtime "electron"
 build_from_source "true"
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index 1e5ab89cce1..b4af222afdc 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,27 +1,27 @@
-990cfa83850fc2934ddf435737ea16c68e222136107aba177d961af839a61765 *electron-v25.8.2-darwin-arm64-symbols.zip
-f6ab7cd71e50fae41cae0192108df98afc0a30583d945d3e673d8483d4dddefe *electron-v25.8.2-darwin-arm64.zip
-2feec213e4b2a4728ef5f5ec833ee8663d801a06b7ed1f172eee4ba3f9f51339 *electron-v25.8.2-darwin-x64-symbols.zip
-04027c3ecb90d8252f1adbd887d9567d5f16eee126f8df753a29fa79d9b61d6b *electron-v25.8.2-darwin-x64.zip
-4a9a49d6003ac86ccba5495ff782f584215cee36f9335772cdc0581911f5f6a1 *electron-v25.8.2-linux-arm64-symbols.zip
-1b15ad0e26785850f9ab2112d3183669aac4b702c474ab7ad31954c649b3351f *electron-v25.8.2-linux-arm64.zip
-4bdd180dff11013d6c2d25c578e5398ac9c7dd3b6255080836868e1cd55e4c13 *electron-v25.8.2-linux-armv7l-symbols.zip
-db4271335284d2d327130063cca6a4adee0678504098c0347e2cb89c4ddefd7a *electron-v25.8.2-linux-armv7l.zip
-ab9c35e7a6df6b2335f273711cc16c94f982f4d55b2c0bba554187f43864242e *electron-v25.8.2-linux-x64-symbols.zip
-08c211d4199096d0ff9c475720f25ff5c089d624660b4c1f1970a413e20312b7 *electron-v25.8.2-linux-x64.zip
-d3bd6ab0be3c4d93a7a19f9da0c391c1ef8daa85027bf00f9ac75a97e7027fcf *electron-v25.8.2-win32-arm64-pdb.zip
-cc6c369bd9d2fc7664bbd5138be5527432e17ec6eb7c7b5405e641e0468dc280 *electron-v25.8.2-win32-arm64-symbols.zip
-d4083f48cc1f7bb311a4a53814e2cd7c343c159f4bcd4ee368d20564e1d34a36 *electron-v25.8.2-win32-arm64.zip
-276b0ba63d6dbb78f99caf2c58213415f22cb4f90ec6e6485214f3174482458c *electron-v25.8.2-win32-ia32-pdb.zip
-45551352678e250c7970c6258d55e1c6451131d1e5f1ea053390bd9d9364d33c *electron-v25.8.2-win32-ia32-symbols.zip
-fc9798e973b6a872d7250754b29caa48b0f0ad7c33f39ab61008525b29111049 *electron-v25.8.2-win32-ia32.zip
-491795df7e70effeae68a11e39675ca32677b44865d10151a2eea71dad2c2815 *electron-v25.8.2-win32-x64-pdb.zip
-fa5962a52022c16fb59d79c7528d50ab314b6a8d1e6b90f4c940bb3a0f061923 *electron-v25.8.2-win32-x64-symbols.zip
-fb5786dc18a10cc29b4d765f34af2f9f9d9866f82007468b55d800dd43feb196 *electron-v25.8.2-win32-x64.zip
-b1ad00396c949d0f37fe3920eb4f667663d7453dce4f141bcbfc560140a85d84 *ffmpeg-v25.8.2-darwin-arm64.zip
-81a3dff9b95d294a7955d67e013ecf65b0c1b929104cea82fcf22774c067d457 *ffmpeg-v25.8.2-darwin-x64.zip
-bd52d57ff97fb56ac01a3482af905d04f0d4e9c13c53858c6d9f99957eca82da *ffmpeg-v25.8.2-linux-arm64.zip
-9b3d09177fa1e63e2a6beecfa70aeec30aeb5c1873ff21128a68051c4e23f95d *ffmpeg-v25.8.2-linux-armv7l.zip
-edc7b1c9f1a0733f109a2c0375a4e40c5bfe0bf28b7f06dcc76e1ada0aa2f125 *ffmpeg-v25.8.2-linux-x64.zip
-aacd68ce8a56e707e20fdcf08ea66348dbb1717b87f9c7e3d80da106fa5aa45b *ffmpeg-v25.8.2-win32-arm64.zip
-29411956a1ab20f63926a764893effd113c0ef0349cbaa355a95c1c1046d5d8d *ffmpeg-v25.8.2-win32-ia32.zip
-80ccd09de3a73e1a3b27ad2aa2a8a3eb5753290b7eee3d2e5ea08837876c3f66 *ffmpeg-v25.8.2-win32-x64.zip
+db3e9eb9f47f465bb63d15de486ea1d9274233b24bbe451038bfbaf48f9b0e39 *electron-v25.8.4-darwin-arm64-symbols.zip
+5d83e2094a26bfe22e4c80e660ab088ec94ae3cc2d518c6efcac338f48cc0266 *electron-v25.8.4-darwin-arm64.zip
+6fdd506328c65a9d8205425a463098210743c9ef79a546738b91a91d56100447 *electron-v25.8.4-darwin-x64-symbols.zip
+d4015cd251e58ef074d1f7f3e99bfbbe4cd6b690981f376fc642b2de955e8750 *electron-v25.8.4-darwin-x64.zip
+b46da627829a84cdf84b5570f95e044d38660fb0e58712757e834ff13b43c72d *electron-v25.8.4-linux-arm64-symbols.zip
+fbb6e06417b1741b94d59a6de5dcf3262bfb3fc98cffbcad475296c42d1cbe94 *electron-v25.8.4-linux-arm64.zip
+2569c260b4bb90894c5e63e175d3ee9665525e928d7c70158c6a9d98cb82f6a9 *electron-v25.8.4-linux-armv7l-symbols.zip
+6301e6fde3e7c8149a5eca84c3817ba9ad3ffcb72e79318a355f025d7d3f8408 *electron-v25.8.4-linux-armv7l.zip
+63580a081a4481eec2773606e9cd50c3468758741f11a14d6c47ab716c064896 *electron-v25.8.4-linux-x64-symbols.zip
+0cbbcaf90f3dc79dedec97d073ffe954530316523479c31b11781a141f8a87f6 *electron-v25.8.4-linux-x64.zip
+8860faaaabcc15a531733dd164c858a1cc1bffefdbba7ec54f7687db796f93f3 *electron-v25.8.4-win32-arm64-pdb.zip
+e909628b4c984b3472c58b3897214e59f55ce69bee99229cdf1451a281865176 *electron-v25.8.4-win32-arm64-symbols.zip
+1355293a73da3e5d3f06a6c95c81a5124c4f26be2ec1035ccfcfeccd4c766f5d *electron-v25.8.4-win32-arm64.zip
+597cbfd2b9d542a289296d792ed9be40c3e97499207675766265a710454f76f5 *electron-v25.8.4-win32-ia32-pdb.zip
+3a0ee0d1435382cfdf727ed70e6c8edd233363dcdadde5c1c6ec170fff243a99 *electron-v25.8.4-win32-ia32-symbols.zip
+13efcbfc4a0a62339b4450c5d71d14230978e25eb410dcc7d3408b413391eead *electron-v25.8.4-win32-ia32.zip
+fef9e5ec4d146e6b310137140cee2a1172964e7584540088b1bc7fd1df15f1ff *electron-v25.8.4-win32-x64-pdb.zip
+1227ec90ae2fb30e01d4c6814af1adae983b78ea832dea0520caaa8a05ac0390 *electron-v25.8.4-win32-x64-symbols.zip
+0bbe72439cab1e72dee5fb850fdb1b17ea16fef61aa3dae93c562687737084f1 *electron-v25.8.4-win32-x64.zip
+41e5b5392efcb1b47826f20e2f867dac6026dd435b92f50acb58bfae99b96e08 *ffmpeg-v25.8.4-darwin-arm64.zip
+bad5ed7f10eef768c95a134cbd6754e9c347eb8bfae871e65975afb96cc49b86 *ffmpeg-v25.8.4-darwin-x64.zip
+bd52d57ff97fb56ac01a3482af905d04f0d4e9c13c53858c6d9f99957eca82da *ffmpeg-v25.8.4-linux-arm64.zip
+9b3d09177fa1e63e2a6beecfa70aeec30aeb5c1873ff21128a68051c4e23f95d *ffmpeg-v25.8.4-linux-armv7l.zip
+edc7b1c9f1a0733f109a2c0375a4e40c5bfe0bf28b7f06dcc76e1ada0aa2f125 *ffmpeg-v25.8.4-linux-x64.zip
+84ec373f124f628ce7d8964e000e79cd1448acec05b92417207baecf9b0f039a *ffmpeg-v25.8.4-win32-arm64.zip
+ce6b46e5395f0f715ff694399580eded7e976c0dd8668304e4b087967fea711f *ffmpeg-v25.8.4-win32-ia32.zip
+7506346ff7a98377eca26464370a7c5a8c44d010d5c46a8357fa107980582fac *ffmpeg-v25.8.4-win32-x64.zip
diff --git a/cgmanifest.json b/cgmanifest.json
index 39a03ec0cbe..8cbbecf6915 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "67b2739f44ce98aad493170fecc696f76dc12de1"
+					"commitHash": "415301c477b600502cf264e93318dda551288829"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "25.8.2"
+			"version": "25.8.4"
 		},
 		{
 			"component": {
diff --git a/package.json b/package.json
index 6d3871fe617..e833f2e693d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.83.0",
-  "distro": "5ec0dc9dd173bbc22d4048b3d3acc9213b965963",
+  "distro": "7df09ac7212a2c85067c0e2ef8c1ec89686483d2",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -148,7 +148,7 @@
     "cssnano": "^4.1.11",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "25.8.2",
+    "electron": "25.8.4",
     "eslint": "8.36.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "^46.5.0",
@@ -231,4 +231,4 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.5.0"
   }
-}
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index ac58de5355e..ff94a6b3053 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3574,10 +3574,10 @@ electron-to-chromium@^1.4.202:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.207.tgz#9c3310ebace2952903d05dcaba8abe3a4ed44c01"
   integrity sha512-piH7MJDJp4rJCduWbVvmUd59AUne1AFBJ8JaRQvk0KzNTSUnZrVXHCZc+eg+CGE4OujkcLJznhGKD6tuAshj5Q==
 
-electron@25.8.2:
-  version "25.8.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.2.tgz#5e8ea742b68a7d1427bf78902ec40a5b7231a58b"
-  integrity sha512-AM1ra6b16EQuO1bJtiA8ZiWqqFLLgVfxD56ykiy+EA5C63Hkx8OmIbe+5JAsLiTwRVvBZ4oCAj6wa2qT+iq8ww==
+electron@25.8.4:
+  version "25.8.4"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.4.tgz#b50877aac7d96323920437baf309ad86382cb455"
+  integrity sha512-hUYS3RGdaa6E1UWnzeGnsdsBYOggwMMg4WGxNGvAoWtmRrr6J1BsjFW/yRq4WsJHJce2HdzQXtz4OGXV6yUCLg==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"