Index: /branches/release-38/lib/MT/CMS/Template.pm
===================================================================
--- /branches/release-38/lib/MT/CMS/Template.pm (revision 2309)
+++ /branches/release-38/lib/MT/CMS/Template.pm (revision 2323)
@@ -2068,11 +2068,13 @@
     } else {
         # nothing left after this publish operation; just return
-        # to the listing screen.
+        # to the edit screen.
         $return_args = $app->uri_params(
-            mode => 'list',
+            mode => 'view',
             args => {
-                _type => 'template',
-                blog_id => scalar $app->param('blog_id'),
-                published => 1
+                _type     => 'template',
+                blog_id   => scalar $app->param('blog_id'),
+                published => 1,
+                id        => $tmpl_id,
+                saved     => 1,
             }
         );