Fix issue with collapsing header element