Buttons not staying hidden on additional selector tabs

I'm having an issue with buttons staying hidden on any tab except the main tab.

I create a new tab with a subset of controls, arrange and hide some buttons. I then return to the Main tab (either still in edit mode or note) and save the Rig Layout. The buttons are still hidden when I return to the second tab. However, if I save and close the scene, and reopen the scene, the hidden buttons are now visible again on the second tab.

Hidden buttons seem to stay hidden, as expected, on the main tab.