fix 9137, 9143
Merge pull request #9149 from adobe/randy/issues-9137-9143

Hide Options button when Working Set hidden