diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig
index 04febae3c..f696dc057 100644
--- a/Resources/views/Form/fields.html.twig
+++ b/Resources/views/Form/fields.html.twig
@@ -25,11 +25,9 @@
 {# CustomFields Choice #}
 {# render an alement in a choice list #}
 {% block cf_choices_list_widget %}
-
-{{ form_row(form.name) }}
-{{ form_row(form.active) }}
-{{ form_row(form.slug) }}
-
+    {{ form_row(form.name) }}
+    {{ form_row(form.active) }}
+    {{ form_row(form.slug) }}
 {% endblock cf_choices_list_widget %}
 
 {# CFChoice : render the different elements in a choice list #}
@@ -80,18 +78,6 @@
 
         jQuery(document).ready(initializeCFChoiceOptionsChoices('{{ form.vars.id }}'));
     </script>
+{%  endblock cf_choices_row %}
 
-{%  endblock cf_choices_row %} 
-
-{% block choice_with_other_widget %}
-<div {{ block('widget_container_attributes') }}>
-{%- for child in form.children._choices %}
-{{- form_widget(child) -}}
-{{- form_label(child) -}}
-{%- if child.vars.value == '_other'  -%}
-{{- form_widget(form.children._other) -}}
-{%- endif -%}
-{% endfor -%}
-</div>
-
-{% endblock choice_with_other_widget %}
\ No newline at end of file
+{# The choice_with_other_widget widget is defined in the main bundle #}
\ No newline at end of file