If you are editing templates, clicking "Templates" in the breadcrumbs shouldn't take you back to the master style's template list. Only clicking Appearance -> Templates will, but if you have multiple styles, you'll have to be selecting the style regardless to edit the correct ones....