Index: /branches/release-39/lib/MT/CMS/Template.pm
===================================================================
--- /branches/release-39/lib/MT/CMS/Template.pm (revision 2504)
+++ /branches/release-39/lib/MT/CMS/Template.pm (revision 2506)
@@ -2269,4 +2269,6 @@
             )
           );
+        return $app->return_to_dashboard( redirect => 1 )
+            if $wtmpl->blog_id ne $blog_id;
         $param->{name} = $wtmpl->name;
         $param->{include_with_ssi} = $wtmpl->include_with_ssi
