1 files changed, 12 insertions, 4 deletions

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 6d6089793..66dc8af41 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -95,10 +95,18 @@ class ServiceWebview extends Component {
         preload={preloadScript}
         partition={service.partition}
         onDidAttach={() => {
-          setWebviewReference({
-            serviceId: service.id,
-            webview: this.webview.view,
-          });
+          // Force the event handler to run in a new task.
+          // This resolves a race condition when the `did-attach` is called,
+          // but the webview is not attached to the DOM yet:
+          // https://github.com/electron/electron/issues/31918
+          // This prevents us from immediately attaching listeners such as `did-stop-load`:
+          // https://github.com/ferdium/ferdium-app/issues/157
+          setTimeout(() => {
+            setWebviewReference({
+              serviceId: service.id,
+              webview: this.webview.view,
+            });
+          }, 0);
         }}
         onUpdateTargetUrl={this.updateTargetUrl}
         useragent={service.userAgent}