--- a/src/pyams_content/component/paragraph/zmi/__init__.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/component/paragraph/zmi/__init__.py	Fri Jun 08 10:33:23 2018 +0200
@@ -32,7 +32,7 @@
 # import packages
 from pyams_content.component.paragraph.zmi.container import ParagraphContainerTable, ParagraphContainerBaseTable
 from pyams_content.features.renderer.zmi import BaseRenderedContentRenderer
-from pyams_form.form import AJAXEditForm, AJAXAddForm
+from pyams_form.form import AJAXEditForm, AJAXAddForm, ajax_config
 from pyams_form.help import FormHelp
 from pyams_form.schema import ActionButton, CloseButton
 from pyams_form.security import ProtectedFormObjectMixin
@@ -47,7 +47,6 @@
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminDialogEditForm
 from pyramid.location import lineage
-from pyramid.view import view_config
 from z3c.form import field, button
 from zope.interface import Interface
 
@@ -71,6 +70,7 @@
 
 @pagelet_config(name='default-paragraphs.html', context=IParagraphFactorySettings, layer=IPyAMSLayer,
                 permission=MANAGE_TOOL_PERMISSION)
+@ajax_config(name='default-paragraphs.json', context=IParagraphFactorySettings, layer=IPyAMSLayer)
 class DefaultParagraphsEditForm(AdminDialogEditForm):
     """Default paragraphs edit form"""
 
@@ -79,16 +79,9 @@
     legend = _("Content block types")
 
     fields = field.Fields(IParagraphFactorySettings)
-    ajax_handler = 'default-paragraphs.json'
     edit_permission = MANAGE_TOOL_PERMISSION
 
 
-@view_config(name='default-paragraphs.json', context=IParagraphFactorySettings, request_type=IPyAMSLayer,
-             permission=MANAGE_TOOL_PERMISSION, renderer='json', xhr=True)
-class DefaultParagraphAJAXEditForm(AJAXEditForm, DefaultParagraphsEditForm):
-    """Default paragraphs edit form, JSON renderer"""
-
-
 @adapter_config(context=(IParagraphFactorySettings, IPyAMSLayer, DefaultParagraphsEditForm), provides=IFormHelp)
 class DefaultParagraphsEditFormHelp(FormHelp):
     """Default paragraphs edit form help"""