Editing a template

When editing a template that was opened from a template folder, after we Save the editing, we want the page to be back in the folder screen we previously were in, not in all uncategorized templates.