Bug 935705 - Fixed toolbar explodes on window resize.
Merge pull request #2153 from mediocrity/prevent-editor-from-exploding

Bug 935705 - Fixed toolbar explodes on window resize.