Issue #21628: Fixed Save and New, and Save Text bugs