Fix navbar issue

fixes #6024

cc @raghunayyar @ringmaster