Update Working Set Visibility

Fixes #8975
@redmunds @MarcelGerber