diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js
index 71c6fca2970..9a6ade27992 100644
--- a/addons/website/static/src/js/website.snippets.js
+++ b/addons/website/static/src/js/website.snippets.js
@@ -700,10 +700,6 @@
             this.$overlay.on('click', '.oe_snippet_clone', function () {
                 var $clone = self.$target.clone(false);
                 self.$target.after($clone);
-                setTimeout(function () {
-                    self.parent.create_overlay($clone);
-                    self.parent.make_active($clone);
-                },0);
             });
         },
 
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 0cdb04a4b30..028c1906e84 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -343,6 +343,7 @@
 
         <template id="publish_management">
             <t t-if="editable" t-ignore="true">
+              <a t-att-href="'/admin/#model=%s&amp;id=%s' % (object._name, object.id)" class="btn btn-default pull-right" title="Manage in backend openerp"><span class="glyphicon glyphicon-wrench"></span></a>
               <div t-attf-class="dropdown js_publish_management pull-right #{object.id and object.website_published and 'css_publish' or 'css_unpublish'}" t-att-data-id="object.id" t-att-data-object="object._name">
                 <a t-attf-class="btn btn-#{object.id and object.website_published and 'success' or 'default'}" t-att-id="'dopprod-%s' % object.id" role="button" data-toggle="dropdown"> Publish options <span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % object.id">
@@ -351,7 +352,6 @@
                         <a href="#" class="js_publish_btn css_unpublish">Unpublish</a>
                         <a href="#" class="js_publish_btn css_publish">Publish</a>
                     </li>
-                    <li><a t-att-href="'/admin/#model=%s&amp;id=%s' % (object._name, object.id)">Manage</a></li>
                 </ul>
               </div>
             </t>