diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index ce94ad45010..c78f8b7f7eb 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -66,6 +66,7 @@
         events: {
             'change #ace-view-list': 'displayView',
             'click button[data-action=save]': 'saveView',
+            'click button[data-action=format]': 'formatXml',
             'click button[data-action=close]': 'hide',
         },
         start: function () {
@@ -92,12 +93,16 @@
                 args: [[this.$viewList.val()], ['arch']]
             }).then(function(result) {
                 var xml = new website.ace.XmlDocument(result[0].arch)
-                var editingSession = new ace.EditSession(xml.format());
+                var editingSession = new ace.EditSession(xml.xml);
                 editingSession.setMode("ace/mode/xml");
                 editingSession.setUndoManager(new ace.UndoManager());
                 editor.setSession(editingSession);
             });
         },
+        formatXml: function () {
+            var xml = new website.ace.XmlDocument(this.aceEditor.getValue());
+            this.aceEditor.setValue(xml.format());
+        },
         saveView: function () {
             var xml = new website.ace.XmlDocument(this.aceEditor.getValue());
             if (xml.isWellFormed()) {
diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index 0343ebc3e3c..b546d41a7ec 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -7,6 +7,7 @@
                     <!-- filled in JS -->
                 </select>
                 <button data-action="save" type="submit" class="btn btn-success">Save</button>
+                <button data-action="format" type="button" class="btn btn-warning">Format</button>
                 <button data-action="close" type="button" class="btn btn-info">Close</button>
             </div>
             <div id="ace-view-editor"/>