Fixed custom click listener not preserved on initialization