A shampoo composition including (a) a silicone polymer including (i) one or more quaternary groups; (ii) at least one silicone block comprising greater than 200 siloxane units; (iii) at least one polyalkylene oxide structural unit; and (iv) at least one terminal ester group, and (b) a detersive surfactant. The silicone polymer has a viscosity of up to 100,000 mPa·s. The silicone polymer is a pre-emulsified dispersion with a particle size of less than about 1 micron.