Fixed navbar as per #9619

This is a fix for #9619.