diff --git a/src/collective/dms/thesaurus/browser/dmsthesaurus_view.pt b/src/collective/dms/thesaurus/browser/dmsthesaurus_view.pt
index 52f648a..e44b1b8 100644
--- a/src/collective/dms/thesaurus/browser/dmsthesaurus_view.pt
+++ b/src/collective/dms/thesaurus/browser/dmsthesaurus_view.pt
@@ -40,14 +40,29 @@ $(document).ready(function() {
 
 
 <script type="text/javascript" tal:condition="python: 'ajax_load' in request.form.keys()">
-function preplinks() {
+function prep_thesaurus_overlay() {
   $('.overlay-ajax a').click(function() {
-    $('.pb-ajax > div').load($(this).attr('href') + '?ajax_load=123 #content>*', preplinks);
+    var urlsplit = $(this).attr('href').split('/');
+    var keyword_id = urlsplit[urlsplit.length-1];
+    $(this).parents('.overlay-ajax').data('keyword-id', keyword_id);
+    $('.pb-ajax > div').load($(this).attr('href') + '?ajax_load=123 #content>*', prep_thesaurus_overlay);
+    return false;
+  });
+  $('.overlay-ajax button').click(function() {
+    overlay_id = $(this).parents('.overlay-ajax').attr('id');
+    field = $('a[rel="#' + overlay_id + '"]').parents('.field');
+    var id = $(this).parents('.overlay-ajax').data('keyword-id');
+    var title = $(this).parents('.overlay-ajax').find('h1').text();
+    $(field).find('select').append('<option id="' + id + '" selected="selected" value="' + id + '"></option>');
+    $(field).find('.selected-options').append('<span class="selected-option" data-term-id="' + id + '">' +
+        '<span>' + title + '</span>' +
+        '<span class="remove">×</span></span>\n');
+    $(this).parents('.overlay-ajax').find('.close').click();
     return false;
   });
 }
 
-preplinks();
+prep_thesaurus_overlay();
 </script>
 
     </div>
diff --git a/src/collective/dms/thesaurus/thesauruskeywords_input.pt b/src/collective/dms/thesaurus/thesauruskeywords_input.pt
index 8b7357e..4e9d66d 100644
--- a/src/collective/dms/thesaurus/thesauruskeywords_input.pt
+++ b/src/collective/dms/thesaurus/thesauruskeywords_input.pt
@@ -21,7 +21,7 @@
 <input name="field-empty-marker" type="hidden" value="1"
        tal:attributes="name string:${view/name}-empty-marker" />
 
-<span id="" class=""><tal:block
+<span id="" class="selected-options"><tal:block
     tal:repeat="item view/items"
     ><span class="selected-option"
            tal:attributes="data-term-id item/value">