[[ Bug 13388 ]] Prevent crash when putting text after button
Merge pull request #1144 from runrevali/bugfix-13388

[[ Bug 13388 ]] Prevent crash when putting text after button