Make 'Save & create new record' work. Fixes #1834