Fix bug moving button out of the div
Merge pull request #406 from lap82/DS-1809

[DS-1809] Fix bug moving button out of the div