Fix all the show/hide toggle bugs
Merge pull request #6379 from guardian/fix-show-hide

Fix all the show/hide toggle bugs