Queue doesn't show current song by default

For example, if we change to the "Browse" menu and then go back to the "Queue", it is up to the first song, while the current and new songs are at the bottom.

It should either stays where it was left or scrolled to bottom instead to top.