diff --git a/entityreference_browser.js b/entityreference_browser.js
index f39998b..39172b8 100644
--- a/entityreference_browser.js
+++ b/entityreference_browser.js
@@ -45,7 +45,14 @@
 
     $('body', context).delegate('a.picker', 'click', function(event) {
       event.preventDefault;
-
+      var id     =  $(this).attr('data-id');
+      if(!$(this).hasClass('selected')) {
+        $(this).addClass('selected');
+      } else {
+        $(this).removeClass('selected');
+        $('.remove[data-id=' + id + ']').trigger('click');
+        return false;
+      }
       var instance = $(this).closest('.entityreference-browser-wrapper'),
         instanceId = instance.attr('id'),
         instanceSettings = settings.entityreference_browser[instanceId],
@@ -77,7 +84,7 @@
         entityId = $(this).attr('data-id'),
         item = $('li[data-id="' + entityId + '"]'),
         list = item.closest('[id^=entityreference-browser]');
-
+      $('a.picker[data-id=' +  entityId + ']').removeClass('selected');
       Drupal.detachBehaviors(item);
       item.remove();
       Drupal.behaviors.entityreferenceBrowser.browserUpdate('', {item: list});