fix topbar scrollbar issues
Merge pull request #2521 from RobinQu/master

fix topbar issues