SONAR-5209 Fix workspace toggling