diff --git a/CHANGELOG b/CHANGELOG
index e081f3b3ab..87024a4a35 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-* Allow to deactivate button access
+* Allow button access to be deactivated
 * Always return tuple for MultiSelection
 * Use default selectors instead of select
 * Add batch option to push queue tasks
diff --git a/trytond/ir/message.xml b/trytond/ir/message.xml
index 44bfba1a31..59d1beb3e3 100644
--- a/trytond/ir/message.xml
+++ b/trytond/ir/message.xml
@@ -385,7 +385,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="text">The code on language must be unique.</field>
         </record>
         <record model="ir.message" id="msg_button_name_unique">
-            <field name="text">The button name in model must be unique.</field>
+            <field name="text">The name of the button must be unique per model.</field>
         </record>
     </data>
 </tryton>
diff --git a/trytond/ir/view/model_button_form.xml b/trytond/ir/view/model_button_form.xml
index f4a3506775..133e8d65c2 100644
--- a/trytond/ir/view/model_button_form.xml
+++ b/trytond/ir/view/model_button_form.xml
@@ -4,12 +4,12 @@ this repository contains the full copyright notices and license terms. -->
 <form>
     <label name="model"/>
     <field name="model"/>
+    <label name="active"/>
+    <field name="active"/>
     <label name="name"/>
     <field name="name"/>
     <label name="string"/>
     <field name="string"/>
-    <label name="active"/>
-    <field name="active"/>
     <separator name="help" colspan="4"/>
     <field name="help" colspan="4"/>
     <separator name="confirm" colspan="4"/>