--- a/src/pyams_content/features/renderer/zmi/__init__.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/features/renderer/zmi/__init__.py	Fri Jun 08 10:33:23 2018 +0200
@@ -21,11 +21,10 @@
 from pyams_skin.layer import IPyAMSLayer
 
 # import packages
-from pyams_form.form import AJAXEditForm
+from pyams_form.form import ajax_config
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_viewlet.viewlet import BaseContentProvider
 from pyams_zmi.form import AdminDialogEditForm
-from pyramid.view import view_config
 from z3c.form import field
 from zope.interface import Interface
 
@@ -64,6 +63,7 @@
 
 @pagelet_config(name='renderer-properties.html', context=IRenderedContent, layer=IPyAMSLayer,
                 permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='renderer-properties.json', context=IRenderedContent, layer=IPyAMSLayer)
 class RendererPropertiesEditForm(AdminDialogEditForm):
     """Renderer properties edit form"""
 
@@ -77,14 +77,7 @@
         renderer = IContentRenderer(self.context)
         return field.Fields(renderer.settings_interface or Interface)
 
-    ajax_handler = 'renderer-properties.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
     def getContent(self):
         return IRendererSettings(self.context)
-
-
-@view_config(name='renderer-properties.json', context=IRenderedContent, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class RendererPropertiesAJAXEditForm(AJAXEditForm, RendererPropertiesEditForm):
-    """Renderer properties edit form, JSON renderer"""