diff --git a/plone/formwidget/contenttree/jquery-contenttree/contenttree.js b/plone/formwidget/contenttree/jquery-contenttree/contenttree.js
index c47210e..0ae732d 100755
--- a/plone/formwidget/contenttree/jquery-contenttree/contenttree.js
+++ b/plone/formwidget/contenttree/jquery-contenttree/contenttree.js
@@ -22,6 +22,7 @@ if(jQuery) (function($){
             });
 
             $(this).contentTreeCancel();
+            input_box.parents('.datagridwidget-cell').triggerHandler('change');
         },
         contentTreeCancel: function() {
             $(".contenttreeWindowBlocker").remove();
diff --git a/plone/formwidget/contenttree/widget.py b/plone/formwidget/contenttree/widget.py
index 1ddd5c9..dca9c72 100644
--- a/plone/formwidget/contenttree/widget.py
+++ b/plone/formwidget/contenttree/widget.py
@@ -180,7 +180,7 @@ class ContentTreeBase(Explicit):
                             var parent = $(this).parents("*[id$='-autocomplete']")
                             var window = parent.siblings("*[id$='-contenttree-window']")
                             window.showDialog('%(url)s', %(expandSpeed)d);
-                                $('#%(id)s-contenttree').contentTree(
+                            $('#' + parent.attr('id').replace('autocomplete', 'contenttree')).contentTree(
                     {
                         script: '%(url)s',
                         folderEvent: '%(folderEvent)s',