Fixed custom button behaviour