Implementing the workaround for enable()/disable() and removing workaround from popup.