diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss
index 6073283bc..8bd435b45 100644
--- a/app/assets/stylesheets/forms.scss
+++ b/app/assets/stylesheets/forms.scss
@@ -218,15 +218,26 @@
     }
   }
 
-  .fr-label .fr-hint-text > *,
-  .fr-fieldset__legend .fr-hint-text > * {
+  .fr-label + .fr-hint-text > *,
+  .fr-fieldset__legend + .fr-hint-text > * {
     // la description d'un champ peut contenir du markup (markdown->html),
-    // on herite donc la fontsize/mrgin/padding du fr-hint-text
+    // on herite donc la fontsize/margin/padding du fr-hint-text
     font-size: inherit;
+    line-height: inherit;
     margin: inherit;
     padding: inherit;
   }
 
+  .fr-label + .fr-hint-text {
+    // les messages d'aide se trouvant juste après un label prennent le même style que ceux se trouvant dans un label
+    margin-top: .25rem;
+  }
+
+  .fr-hint-text + .fr-input {
+    // les champs se trouvant juste après un message d'aide prennent le même syle que ceux se trouvant juste après un label
+    margin-top: .5rem;
+  }
+
   input[type='password'],
   select:not(.fr-select) {
     display: block;
diff --git a/app/components/editable_champ/champ_label_component/champ_label_component.html.haml b/app/components/editable_champ/champ_label_component/champ_label_component.html.haml
index 5dffbf6cd..e76a0da5b 100644
--- a/app/components/editable_champ/champ_label_component/champ_label_component.html.haml
+++ b/app/components/editable_champ/champ_label_component/champ_label_component.html.haml
@@ -3,5 +3,9 @@
 - if @champ.html_label?
   = @form.label @champ.main_value_name, id: @champ.labelledby_id, for: @champ.input_id, class: 'fr-label' do
     - render EditableChamp::ChampLabelContentComponent.new form: @form, champ: @champ, seen_at: @seen_at
+  - if @champ.description.present?
+    .fr-hint-text= render SimpleFormatComponent.new(@champ.description, allow_a: true)
 - elsif @champ.legend_label?
-  %legend.fr-fieldset__legend.fr-text--regular{ id: @champ.labelledby_id }= render EditableChamp::ChampLabelContentComponent.new form: @form, champ: @champ, seen_at: @seen_at
+  %legend.fr-fieldset__legend.fr-text--regular.fr-pb-1w{ id: @champ.labelledby_id }= render EditableChamp::ChampLabelContentComponent.new form: @form, champ: @champ, seen_at: @seen_at
+  - if @champ.description.present?
+    .fr-hint-text{ id: @champ.describedby_id }= render SimpleFormatComponent.new(@champ.description, allow_a: true)
diff --git a/app/components/editable_champ/champ_label_content_component/champ_label_content_component.html.haml b/app/components/editable_champ/champ_label_content_component/champ_label_content_component.html.haml
index 38e4a4e6b..b4dbc315a 100644
--- a/app/components/editable_champ/champ_label_content_component/champ_label_content_component.html.haml
+++ b/app/components/editable_champ/champ_label_content_component/champ_label_content_component.html.haml
@@ -17,8 +17,5 @@
 - if hint?
   %span.fr-hint-text{ data: { controller: 'date-input-hint' } }= hint
 
-- if @champ.description.present?
-  %span.fr-hint-text= render SimpleFormatComponent.new(@champ.description, allow_a: true)
-
 - if @champ.textarea? && @champ.character_limit_base&.positive?
   %span.fr-hint-text= t('.recommended_size', size: @champ.character_limit_base)