--- a/src/pyams_content/shared/view/zmi/reference.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/shared/view/zmi/reference.py	Fri Jun 08 10:33:23 2018 +0200
@@ -27,12 +27,11 @@
 from z3c.form.interfaces import INPUT_MODE
 
 # import packages
-from pyams_form.form import AJAXEditForm
+from pyams_form.form import ajax_config
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.viewlet.menu import MenuItem, MenuDivider
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminEditForm
-from pyramid.view import view_config
 from z3c.form import field, button
 from zope.interface import Interface, implementer
 
@@ -56,6 +55,7 @@
 
 
 @pagelet_config(name='references.html', context=IWfView, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
+@ajax_config(name='references.json', context=IWfView, layer=IPyAMSLayer, permission=MANAGE_CONTENT_PERMISSION)
 @implementer(IWidgetForm, IInnerPage)
 class ViewReferencesEditForm(AdminEditForm):
     """View references settings edit form"""
@@ -70,11 +70,3 @@
             return button.Buttons(IUncheckedEditFormButtons)
         else:
             return button.Buttons(Interface)
-
-    ajax_handler = 'references.json'
-
-
-@view_config(name='references.json', context=IWfView, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ViewReferencesAJAXEditForm(AJAXEditForm, ViewReferencesEditForm):
-    """References settings edit form, JSON renderer"""