diff --git a/addons/website_mail/views/website_email_designer.xml b/addons/website_mail/views/website_email_designer.xml
index 60c21255dd2..dc2014c9310 100644
--- a/addons/website_mail/views/website_email_designer.xml
+++ b/addons/website_mail/views/website_email_designer.xml
@@ -10,38 +10,43 @@
         </t>
         <div id="wrap">
             <div class="container">
-                <h1 t-field="template.name"/>
-                <a t-att-href="'/web#action=email_template.action_email_template_tree_all&amp;id=%d' % template.id">
-                    Back to back-end
-                </a>
-                <div class="row" style="width: 600px;">
-                    <div class="row">
-                        <div class="col-lg-3"><b>Email From</b></div>
-                        <div class="col-lg-9"><span t-field="template.email_from"/></div>
-                    </div>
+                <div class="row">
+                    <div class="col-md-8">
+                        <a class="pull-right mt32"
+                                t-att-href="'/web#return_label=Website&amp;action=email_template.action_email_template_tree_all&amp;view_type=form&amp;id=%d' % template.id">
+                            <button class="btn btn-primary">Back to Template Form</button>
+                        </a>
+                        <h1 t-field="template.name"/>
+                        <div class="row" style="width: 600px;">
+                            <div class="row">
+                                <div class="col-lg-3"><b>Email From</b></div>
+                                <div class="col-lg-9"><span t-field="template.email_from"/></div>
+                            </div>
 
-                    <div class="row">
-                        <div class="col-lg-3"><b>To (Email)</b></div>
-                        <div class="col-lg-9"><span t-field="template.email_to"/></div>
-                    </div>
+                            <div class="row">
+                                <div class="col-lg-3"><b>To (Email)</b></div>
+                                <div class="col-lg-9"><span t-field="template.email_to"/></div>
+                            </div>
 
-                    <div class="row">
-                        <div class="col-lg-3"><b>To (Partners)</b></div>
-                        <div class="col-lg-9"><span t-field="template.partner_to"/></div>
-                    </div>
+                            <div class="row">
+                                <div class="col-lg-3"><b>To (Partners)</b></div>
+                                <div class="col-lg-9"><span t-field="template.partner_to"/></div>
+                            </div>
 
-                    <div class="row">
-                        <div class="col-lg-3"><b>Reply To</b></div>
-                        <div class="col-lg-9"><span t-field="template.reply_to"/></div>
-                    </div>
+                            <div class="row">
+                                <div class="col-lg-3"><b>Reply To</b></div>
+                                <div class="col-lg-9"><span t-field="template.reply_to"/></div>
+                            </div>
 
-                    <div class="row">
-                        <div class="col-lg-3"><b>Subject</b></div>
-                        <div class="col-lg-9"><span t-field="template.subject"/></div>
-                    </div>
+                            <div class="row">
+                                <div class="col-lg-3"><b>Subject</b></div>
+                                <div class="col-lg-9"><span t-field="template.subject"/></div>
+                            </div>
 
-                    <div class="row well">
-                        <div t-field="template.body_html" style="position: relative;"/>
+                            <div class="row well">
+                                <div t-field="template.body_html" style="position: relative;"/>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>