Fix for "active" state on top bar buttons.