diff --git a/product.py b/product.py
index 7c65569077..460266653d 100644
--- a/product.py
+++ b/product.py
@@ -42,6 +42,9 @@ class Product:
     __name__ = 'product.product'
     attributes = fields.Dict('product.attribute', 'Attributes',
         domain=[
-            ('sets', '=', Eval('attribute_set', -1)),
+            ('sets', '=',
+                Eval('_parent_template', {}).get('attribute_set', -1)),
             ],
-        depends=['attribute_set'])
+        states={
+            'readonly': ~Eval('_parent_template', {}),
+            })
diff --git a/view/product_form.xml b/view/product_form.xml
index dcda11a81c..c2606c7b36 100644
--- a/view/product_form.xml
+++ b/view/product_form.xml
@@ -3,8 +3,8 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath
-        expr="/form/notebook/page[@id='attributes']/field[@name='attribute_set']"
-        position="after">
-        <field name="attributes" colspan="4"/>
+        expr="/form/separator[@name='description']"
+        position="before">
+        <field name="attributes" colspan="6"/>
     </xpath>
 </data>
diff --git a/view/template_form.xml b/view/template_form.xml
index c519c28c20..ea461b4dec 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -2,10 +2,10 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="/form/notebook" position="inside">
-        <page string="Attributes" id="attributes">
-            <label name="attribute_set"/>
-            <field name="attribute_set"/>
-        </page>
+    <xpath expr="/form/notebook/page[@id='general']/field[@name='products']"
+        position="before">
+        <label name="attribute_set"/>
+        <field name="attribute_set"/>
+        <newline/>
     </xpath>
 </data>