Index: /branches/release-36/lib/MT/CMS/Common.pm
===================================================================
--- /branches/release-36/lib/MT/CMS/Common.pm (revision 2026)
+++ /branches/release-36/lib/MT/CMS/Common.pm (revision 2113)
@@ -370,4 +370,8 @@
     }
     elsif ( $type eq 'template' && $q->param('rebuild') ) {
+        if ( !$id ) {
+            # add return argument for newly created templates
+            $app->add_return_arg( id => $obj->id );
+        }
         $q->param( 'type',            'index-' . $obj->id );
         $q->param( 'tmpl_id',         $obj->id );