Fix issue with floating unused modal during store product selection