Merge pull request from lannonbr/fix-horizontal-scrollbar-bug Fix horizontal scrollbar bug