--- a/src/pyams_content/features/review/zmi/__init__.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/features/review/zmi/__init__.py	Fri Jun 08 10:33:23 2018 +0200
@@ -29,7 +29,7 @@
 
 # import packages
 from pyams_content.features.review import ReviewComment
-from pyams_form.form import AJAXAddForm
+from pyams_form.form import AJAXAddForm, ajax_config
 from pyams_form.schema import CloseButton
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_security.schema import PrincipalsSet
@@ -93,6 +93,7 @@
 
 @pagelet_config(name='ask-review.html', context=IReviewTarget, layer=IPyAMSLayer,
                 permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='ask-review.json', context=IReviewTarget, layer=IPyAMSLayer, base=AJAXAddForm)
 class WfSharedContentReviewForm(AdminDialogAddForm):
     """Shared content review form"""
 
@@ -102,7 +103,6 @@
     fields = field.Fields(ISharedContentReviewInfo)
     buttons = button.Buttons(ISharedContentReviewButtons)
 
-    ajax_handler = 'ask-review.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
     label_css_class = 'control-label col-md-4'
@@ -127,12 +127,6 @@
                                       data.get('comment'),
                                       data.get('notify_all'))
 
-
-@view_config(name='ask-review.json', context=IReviewTarget, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class WfSharedContentReviewAJAXForm(AJAXAddForm, WfSharedContentReviewForm):
-    """Shared content review form, JSON renderer"""
-
     def get_ajax_output(self, changes):
         translate = self.request.localizer.translate
         if changes: