3 files changed, 29 insertions, 22 deletions
diff --git a/src/runtime/lock_js.go b/src/runtime/lock_js.go
index d08238ce3c..23f17080f2 100644
--- a/src/runtime/lock_js.go
+++ b/src/runtime/lock_js.go
@@ -144,28 +144,19 @@ func checkTimeouts() {
 	}
 }
 
+var isHandlingEvent = false
+var nextEventIsAsync = false
 var returnedEventHandler *g
 
-func init() {
-	// At the toplevel we need an extra goroutine that handles asynchronous events.
-	initg := getg()
-	go handleAsyncEvents(initg)
-	gopark(nil, nil, waitReasonZero, traceEvNone, 1)
-}
-
-func handleAsyncEvents(initg *g) {
-	returnedEventHandler = getg()
-	goready(initg, 1)
-
-	gopark(nil, nil, waitReasonZero, traceEvNone, 1)
-	returnedEventHandler = nil
-
-	pause(getcallersp() - 16)
-}
-
 // beforeIdle gets called by the scheduler if no goroutine is awake.
-// We resume the event handler (if available) which will pause the execution.
+// If we are not already handling an event, then we pause for an async event.
+// If an event handler returned, we resume it and it will pause the execution.
 func beforeIdle() bool {
+	if !isHandlingEvent {
+		nextEventIsAsync = true
+		pause(getcallersp() - 16)
+		return true
+	}
 	if returnedEventHandler != nil {
 		goready(returnedEventHandler, 1)
 		return true
@@ -184,20 +175,36 @@ func scheduleTimeoutEvent(ms int64) int32
 func clearTimeoutEvent(id int32)
 
 func handleEvent() {
+	if nextEventIsAsync {
+		nextEventIsAsync = false
+		checkTimeouts()
+		go handleAsyncEvent()
+		return
+	}
+
+	prevIsHandlingEvent := isHandlingEvent
+	isHandlingEvent = true
 	prevReturnedEventHandler := returnedEventHandler
 	returnedEventHandler = nil
 
-	checkTimeouts()
 	eventHandler()
 
+	// wait until all goroutines are idle
 	returnedEventHandler = getg()
 	gopark(nil, nil, waitReasonZero, traceEvNone, 1)
 
+	isHandlingEvent = prevIsHandlingEvent
 	returnedEventHandler = prevReturnedEventHandler
 
 	pause(getcallersp() - 16)
 }
 
+func handleAsyncEvent() {
+	isHandlingEvent = true
+	eventHandler()
+	isHandlingEvent = false
+}
+
 var eventHandler func()
 
 //go:linkname setEventHandler syscall/js.setEventHandler
diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go
index 8296a8590d..df6e02f62a 100644
--- a/src/runtime/symtab.go
+++ b/src/runtime/symtab.go
@@ -253,7 +253,7 @@ const (
 	funcID_debugCallV1
 	funcID_gopanic
 	funcID_panicwrap
-	funcID_handleAsyncEvents
+	funcID_handleAsyncEvent
 	funcID_wrapper // any autogenerated code (hash/eq algorithms, method wrappers, etc.)
 )
 
diff --git a/src/runtime/traceback.go b/src/runtime/traceback.go
index 96fb33c04b..0e4b75a7e6 100644
--- a/src/runtime/traceback.go
+++ b/src/runtime/traceback.go
@@ -998,7 +998,7 @@ func topofstack(f funcInfo, g0 bool) bool {
 // isSystemGoroutine reports whether the goroutine g must be omitted
 // in stack dumps and deadlock detector. This is any goroutine that
 // starts at a runtime.* entry point, except for runtime.main,
-// runtime.handleAsyncEvents (wasm only) and sometimes runtime.runfinq.
+// runtime.handleAsyncEvent (wasm only) and sometimes runtime.runfinq.
 //
 // If fixed is true, any goroutine that can vary between user and
 // system (that is, the finalizer goroutine) is considered a user
@@ -1009,7 +1009,7 @@ func isSystemGoroutine(gp *g, fixed bool) bool {
 	if !f.valid() {
 		return false
 	}
-	if f.funcID == funcID_runtime_main || f.funcID == funcID_handleAsyncEvents {
+	if f.funcID == funcID_runtime_main || f.funcID == funcID_handleAsyncEvent {
 		return false
 	}
 	if f.funcID == funcID_runfinq {