prevent multiple clicks and add seperate click handler, #2307