Revert "Fix bug when scrollbar visible?"

This reverts commit e3e33d0bb74cce8da3d29fdc8f8db1fc41b14100.

I have to do more testing on different Desktop envirronement/ OS to know what to do with the scrollbars