diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index e25e301b19c..157d19b56c0 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -59,6 +59,12 @@
                                id="link-new" pattern="[\\w/-]+"/>
                     </li>
                     <li class="list-group-item form-group clearfix">
+                        <div class="pull-right">
+                            <label>
+                                <input type="checkbox" class="window-new"/>
+                                Open in new window
+                            </label>
+                        </div>
                         <h3 class="list-group-item-heading">
                             <label for="link-external" class="control-label">
                                 External Website
@@ -66,12 +72,6 @@
                         </h3>
                         <input type="text" class="form-control url url-source"
                                id="link-external" placeholder="http://openerp.com"/>
-                        <div class="pull-right">
-                            <label>
-                                <input type="checkbox" class="window-new"/>
-                                Open in new window
-                            </label>
-                        </div>
                     </li>
                     <li class="list-group-item form-group">
                         <h3 class="list-group-item-heading">
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 5cc4383412c..8070bd97fbf 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -11,7 +11,7 @@
             </a>
         </template>
 
-        <template id="website.layout" inherit_id="website.layout" inherit_option_id="website.layout">
+        <template id="website.layout" inherit_id="website.layout">
             <!-- Load stylesheets before scripts to avoid blocking -->
             <xpath expr="//head/link" position="after">
                 <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>