Merge pull request #9829 from Extarys/9827-broken-navbar