Make cancel work properly when Keep Solar On option is selected