Provided is a conditioning formulation, which preferably includes one or more bis-alkoxy-terminated glycol-functionalized aminosilicones, one or more non-functionalized aminosilicones, one or more fatty alcohols, one or more alkyl quaternary ammonium salts, and water. Also provided is a method of conditioning keratinous fibers (e.g., hair), which includes applying to the keratinous fibers an effective amount of the formulation of the present invention and, optionally, removing (e.g., rinsing) at least a portion of the formulation therefrom.