Toolbar: removing popup removes page-header-fixed class

Fixes gh-6978
Fixes gh-6939