fix attachments button jumping
Merge branch 'master' into develop