An emulsion includes a liquid continuous phase and a dispersed phase including a cross-linked aminosiloxane polymer. The cross-linked aminosiloxane polymer includes a first siloxane backbone, a second siloxane backbone, and at least one intramolecular structure cross-linking a silicon atom of the first siloxane backbone and a silicon atom of the second siloxane backbone. The intramolecular structure has the chemical structure: (Formula (I)) wherein X is chosen from the following groups (Formula (II) (Formula (III)) or (Formula (IV)) wherein each R is independently a C-1-C-10 hydrocarbon group, each R1 is independently a C-1-C-10 hydrocarbon group, each R2 is independently a hydrogen atom, OH, a C-1-C-12 hydrocarbon group, a phenyl group, R′(OR″)m wherein m is 1 to 3, or R′OH, wherein each of R′ and R″ is independently an alkyl group, and wherein a is 0 or 1. This disclosure also provides a method of forming the emulsion.