Preview: Fix click handler being removed incorrectly