Fixed click handlers sometimes not getting restored.