Aqueous cleaning and surface treatment compositions for imparting oil and water repellency to treated surfaces which comprise: (a) fluoroaliphatic radical-containing poly(oxyalkylene) compound; (b) anti-resoiling composition; (c) anionic surfactant compound, preferably one or more selected from alkyl sulfates, alkyl benzene sulfates, and alkane sulfonates as well as salts thereof; (d) organic solvent; (e) citric acid salts, preferably one or more anhydrous and dihydrous sodium citrates; (f) water, wherein the compositions of the invention are at a neutral or alkaline pH, especially from about 8 to about 10. The compositions are particularly shelf stable, and exhibit excellent shelf stability in pressurized aerosol containers.