Demos: persistent toolbar active state fix

Fixes gh-7578