[GEOS-5754] Some 'Save' buttons do not work with Google Chrome, improved patch