diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 0a2de37b796..33dc755286c 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -65,7 +65,8 @@
                 method: 'read',
                 args: [[this.$viewList.val()], ['arch']]
             }).then(function(result) {
-                var editingSession = new ace.EditSession(result[0].arch);
+                var prettyfied = vkbeautify.xml(result[0].arch, "    ");
+                var editingSession = new ace.EditSession(prettyfied + "\n");
                 editingSession.setMode("ace/mode/xml");
                 editingSession.setUndoManager(new ace.UndoManager());
                 editor.setSession(editingSession);
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index b36e697db55..8e0dfbb75f4 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -30,13 +30,14 @@
                             <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
 
                             <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.2/ckeditor.js"></script>
-                            <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ace/1.1.01/ace.js"></script>
                             <script type="text/javascript" src="/website/static/lib/ckeditor.sharedspace/plugin.js"></script>
                             <script type="text/javascript">
                                 CKEDITOR.disableAutoInline = true;
                                 // EDIT ALL THE THINGS
                                 CKEDITOR.dtd.$editable = $.extend( {}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
                             </script>
+                            <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ace/1.1.01/ace.js"></script>
+                            <script type="text/javascript" src="//vkbeautify.googlecode.com/files/vkbeautify.0.99.00.beta.js"></script>
                             <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
                             <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
                             <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>