proper reset of state upon enter
Merge pull request #1896 from DaNiwa/fix_shopping

proper reset of state upon enter