diff --git a/CHANGES.rst b/CHANGES.rst
index a717895527..2fc072d37b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -21,6 +21,7 @@ Bug fixes:
 - Unflakied a unit test.
   [Rotonen]
 
+- *add item here*
 
 5.1.2 (2018-04-08)
 ------------------
diff --git a/Products/CMFPlone/static/patterns/toolbar/src/toolbar.js b/Products/CMFPlone/static/patterns/toolbar/src/toolbar.js
index 337e5b943d..fb29ec5521 100644
--- a/Products/CMFPlone/static/patterns/toolbar/src/toolbar.js
+++ b/Products/CMFPlone/static/patterns/toolbar/src/toolbar.js
@@ -390,7 +390,7 @@ define([
           url: $('body').attr('data-portal-url') + path + '/@@render-toolbar'
         }).done(function(data) {
           var $el = $(utils.parseBodyTag(data));
-          that.$el.parent.replaceWith($el);
+          that.$el.replaceWith($el);
           Registry.scan($el);
         });
       });