diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index 01230f27a..70fb1f932 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -154,9 +154,9 @@ def edit_service_template(service_id, template_id):
                 raise e
         else:
             return redirect(url_for(
-                '.choose_template',
+                '.view_template',
                 service_id=service_id,
-                template_type=template['template_type']
+                template_id=template_id
             ))
     return render_template(
         'views/edit-{}-template.html'.format(template['template_type']),
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index defd07af7..922357eac 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -63,7 +63,7 @@ def test_should_redirect_when_saving_a_template(app_,
 
             assert response.status_code == 302
             assert response.location == url_for(
-                '.choose_template', service_id=service_id, template_type='sms', _external=True)
+                '.view_template', service_id=service_id, template_id=template_id, _external=True)
             mock_update_service_template.assert_called_with(
                 template_id, name, 'sms', content, service_id, None)
 
@@ -210,9 +210,9 @@ def test_should_redirect_when_saving_a_template_email(app_,
                 template_id=template_id), data=data)
             assert response.status_code == 302
             assert response.location == url_for(
-                '.choose_template',
+                '.view_template',
                 service_id=service_id,
-                template_type='email',
+                template_id=template_id,
                 _external=True)
             mock_update_service_template.assert_called_with(
                 template_id, name, 'email', content, service_id, subject)