An aqueous hair conditioning composition comprising discrete, dispersed droplets of a hydrophobic conditioning oil with a mean droplet diameter (D3,2) of 4 micrometers or less, a cationic deposition polymer and a block copolymer of ethylene glycol and propylene glycol according to the Formula (I) with the mean value of y from 10 to 60 and the values of x and z both from 1 to 150, or a block copolymer according to Formula (II) wherein the mean value of a is 2 or more and the mean value of b is 2 or more. ##STR00001##