Move disabled check to eventHandler