fix bug 840669 - Prevent zoom layout issues
Merge pull request #862 from darkwing/zoom-fix-840669

fix bug 840669 - Prevent zoom layout issues