Toolbar: removing popup removes page-header-fixed class

Fixes gh-6987
Fixes gh-6939