Backport 2515 nav scrollbar

See #2515, thanks to @yannickoo!