diff --git a/CHANGELOG b/CHANGELOG
index c5b6eebeb1..afd91a39a8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add all buttons to default form view
 * Unify PYSON string format
 * Forbid all white spaces except space in Char field
 
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index 47e4eba7fb..b5edeac521 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -334,6 +334,11 @@ class ModelView(Model):
                             xml += "<newline/>"
                     else:
                         xml += '<field name="%s" colspan="4"/>' % (i,)
+                if cls._buttons:
+                    xml += '<group id="buttons" col="-1" colspan="4">'
+                    for button in cls._buttons:
+                        xml += '<button name="%s"/>' % button
+                    xml += '</group>'
                 xml += "</form>"
             elif view_type == 'tree':
                 field = 'id'