Issue #21625: Fixed listeners on workspace