Sorry, didn't see that in the first review. The event handler adding/removing has been moved into setEnabled().