diff --git a/tmp/entityreference_browser/entityreference_browser.js b/sites/all/modules/entityreference_browser/entityreference_browser.js
index 4943193..b996764 100644
--- a/tmp/entityreference_browser/entityreference_browser.js
+++ b/sites/all/modules/entityreference_browser/entityreference_browser.js
@@ -44,7 +44,7 @@
 				});
 			});
 
-			$('body').delegate('a.picker', 'click', function(event) {
+			$('body', context).delegate('a.picker', 'click', function(event) {
 				event.preventDefault;
 
 				var instance = $(this).closest('.entityreference-browser-wrapper'),
@@ -71,13 +71,13 @@
 				return false;
 			});
 
-			$('body').delegate('a.remove', 'click', function(event) {
+			$('body', context).delegate('a.remove', 'click', function(event) {
 				event.preventDefault;
 
 				var element = $(this).closest('div.entityreference-browser-wrapper'),
 						entityId = $(this).attr('data-id'),
 						item = $('li[data-id="' + entityId + '"]'),
-						list = item.closest('ul');
+						list = item.closest('[id^=entityreference-browser]');
 
 				Drupal.detachBehaviors(item);
 				item.remove();