Disclosed are conditioning compositions comprising by weight: (a) from about 0.1% to about 10% of a cationic surfactant; (b) from about 0.05% to about 10% of a water-soluble polymer selected from the group consisting of a water-soluble anionic polymer, a water-soluble amphoteric polymer, and mixtures thereof; (c) from about 1.0% to about 10% of a high melting point fatty compound; and (d) an aqueous carrier; wherein the cationic surfactant and the polymer from a water-soluble complex; and wherein the cationic surfactant and the high melting point fatty compound from a gel matrix. The compositions are especially suitable for hair care products such as hair conditioning products for rinse-off use.