diff --git a/themis/fields/widgets.py b/themis/fields/widgets.py
index 1fa23bd..c5891ec 100644
--- a/themis/fields/widgets.py
+++ b/themis/fields/widgets.py
@@ -26,8 +26,7 @@ from themis.fields.interfaces import IMailId, IMailIdWidget
 from themis.fields.interfaces import IMailRefId, IMailRefIdWidget
 
 from plone.formwidget.autocomplete.interfaces import IAutocompleteWidget
-from plone.formwidget.autocomplete.widget import AutocompleteSelectionWidget
-from plone.formwidget.autocomplete import AutocompleteFieldWidget
+from plone.formwidget.autocomplete.widget import AutocompleteSelectionWidget, AutocompleteMultiSelectionWidget
 
 from z3c.form.browser.orderedselect import OrderedSelectWidget
 from z3c.form.browser.checkbox import CheckBoxWidget
@@ -208,7 +207,7 @@ class OrderedSelectAndAddWidget(OrderedSelectWidget):
 @implementer(IFieldWidget)
 def RelatedDocFieldWidget(field, request):
     '''IFieldWidget factory for RadioChoiceWidget'''
-    return FieldWidget(field, ContentTreeWidget(request))
+    return FieldWidget(field, AutocompleteSelectionWidget(request))
 
 
 @adapter(IRelatedDocs, IFormLayer)
@@ -216,6 +215,7 @@ def RelatedDocFieldWidget(field, request):
 def RelatedDocsFieldWidget(field, request):
     '''IFieldWidget factory for RelatedDocsWidget'''
     return FieldWidget(field, MultiContentTreeWidget(request))
+    return FieldWidget(field, AutocompleteMultiSelectionWidget(request))