Index: /branches/release-35/lib/MT/CMS/Template.pm
===================================================================
--- /branches/release-35/lib/MT/CMS/Template.pm (revision 1959)
+++ /branches/release-35/lib/MT/CMS/Template.pm (revision 1972)
@@ -101,5 +101,12 @@
         $param->{saved_rebuild} = 1 if $q->param('saved_rebuild');
 
+        my $filter = $app->param('filter_key');
+        if ($param->{template_group} eq 'email') {
+            $app->param( 'filter_key', 'email_templates' );
+        }elsif  ($param->{template_group} eq 'system') {
+            $app->param( 'filter_key', 'system_templates' );
+        }
         $app->load_list_actions( 'template', $param );
+        $app->param( 'filter_key', $filter );
 
         $obj->compile;