diff --git a/addons/email_template/ir_actions.py b/addons/email_template/ir_actions.py
index 64c50651f11..ae2395e3b81 100644
--- a/addons/email_template/ir_actions.py
+++ b/addons/email_template/ir_actions.py
@@ -54,7 +54,8 @@ class actions_server(osv.Model):
             readonly=True, string='Body'
         ),
         'template_id': fields.many2one(
-            'email.template', 'Email Template', ondelete='set null'
+            'email.template', 'Email Template', ondelete='set null',
+            domain="[('model_id', '=', model_id)]",
         ),
     }
 
diff --git a/addons/email_template/ir_actions_view.xml b/addons/email_template/ir_actions_view.xml
index fae9c364312..8f5875257aa 100644
--- a/addons/email_template/ir_actions_view.xml
+++ b/addons/email_template/ir_actions_view.xml
@@ -16,7 +16,6 @@
                         <group attrs="{'invisible': [('model_id', '=', False)]}">
                             <field name="template_id"
                                     on_change='on_change_template_id(template_id)'
-                                    domain="[('model_id', '=', model_id)]"
                                     attrs="{'required': [('state', '=', 'email')]}"/>
                             <p colspan="2" attrs="{'invisible': [('template_id', '!=', False)]}">
                                 Choose a template to display its values.