The present invention discloses an improved cleaning composition for cleaning metal surfaces such as aluminum and aluminum-containing alloys. The cleaning composition of the present invention comprises water and an ethoxylate of an alcohol having Formula R1—OH wherein R1 is a saturated or unsaturated, straight-chain or branched aliphatic having from 12 to 80 carbon atoms; an inorganic pH adjusting component; and at least one surfactant that is different than the ethoxylate set forth above. The cleaning composition of the present invention also has an average water-break-free percent reduction of less than 50% after 7 days aging of a working composition prepared from the cleaning composition. The present invention also provides a method of cleaning a metal surface with the cleaning composition of the invention.