Fixed show/hide all button twitching CORE-385