Second attempt at enabled -> disabled - needed for new UI widgets

TBR