Disclosed is a hair conditioning composition comprising: (a) a quaternized silicone polymer (b) a grafted silicone copolyol (c) a cationic surfactant system comprising a dialkyl quaternized ammonium salt cationic surfactant (d) a high melting point fatty compound and (e) an aqueous carrier. The present invention can provide improved conditioning benefits such as smooth feel and reduced friction in conditioning compositions using dialkyl quaternized ammonium salt cationic surfactants.