fix bug 926616 - Move overflow prevention to only place it's used, zone
Merge pull request #1509 from darkwing/double-scrollbars-926616

fix bug 926616 - Move overflow prevention to only place it's used, zone