issue #20177: Fix problem where new workspace was triggered twice.
Merge pull request #389 from jrogelstad/20177

issue #20177: Fix problem where new workspace was triggered twice.