diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 1fe4149e78d..2281b6fd30d 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -85,7 +85,7 @@
 
                     // display button
                     var $el = $(previousSelection = selected.$);
-                    var $btn = $('<button type="button" class="btn btn-primary" contenteditable="false">Edit</button>')
+                    var $btn = $('<button type="button" class="btn btn-primary image-edit-button" contenteditable="false">Edit</button>')
                         .insertAfter($el)
                         .click(function (e) {
                             e.preventDefault();
@@ -100,6 +100,11 @@
                         left: $el.width() / 2 + position.left - $btn.outerWidth() / 2,
                     });
                 });
+                editor.on('destroy', function (evt) {
+                    if (previousSelection) {
+                        $('.image-edit-button').remove();
+                    }
+                });
 
                 //noinspection JSValidateTypes
                 editor.addCommand('link', {