Remove bug introduced when trying to simplify re-enabling widgets