Don't replace the save-success screen until the user selects something

Don't replace the save-success screen until the user selects something #401