Moved restoring of click handlers to button handler

AFDP-51