diff --git a/assets/json/Signalement/desordres_profile_occupant.json b/assets/json/Signalement/desordres_profile_occupant.json
index 1e4ada744..baf0bfb97 100644
--- a/assets/json/Signalement/desordres_profile_occupant.json
+++ b/assets/json/Signalement/desordres_profile_occupant.json
@@ -45,7 +45,8 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_les_desordres_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -296,7 +297,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_proprete_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -371,7 +373,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_eau_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -457,7 +460,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_isolation_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -527,7 +531,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_maintenance_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -646,7 +651,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_nuisibles_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -869,7 +875,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_securite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -928,7 +935,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_incendie_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1037,7 +1045,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_accessibilite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1096,7 +1105,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_bruit_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1393,7 +1403,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_eau_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1506,7 +1517,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_aeration_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1737,7 +1749,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_chauffage_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2076,7 +2089,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_humidite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2250,7 +2264,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_securite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2374,7 +2389,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_electricite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2579,7 +2595,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_nuisibles_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2656,7 +2673,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_bruit_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2733,7 +2751,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_lumiere_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2795,7 +2814,8 @@
                 "customCss": "fr-mb-3v",
                 "conditional": {
                   "show": "formStore.hasDesordre('desordres_') === false"
-                }
+                },
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2815,7 +2835,8 @@
                 "customCss": "fr-mb-3v",
                 "conditional": {
                   "show": "formStore.hasDesordre('desordres_') === true"
-                }
+                },
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/desordres_profile_tiers.json b/assets/json/Signalement/desordres_profile_tiers.json
index 55338474c..70721ad8a 100644
--- a/assets/json/Signalement/desordres_profile_tiers.json
+++ b/assets/json/Signalement/desordres_profile_tiers.json
@@ -45,7 +45,8 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_les_desordres_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -309,7 +310,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_proprete_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -384,7 +386,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_eau_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -470,7 +473,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_isolation_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -540,7 +544,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_maintenance_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -659,7 +664,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_nuisibles_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -882,7 +888,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_securite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -941,7 +948,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_incendie_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1050,7 +1058,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_accessibilite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1109,7 +1118,8 @@
                 "label": "Suivant",
                 "slug": "desordres_batiment_bruit_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1415,7 +1425,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_eau_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1532,7 +1543,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_aeration_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1763,7 +1775,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_chauffage_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2033,7 +2046,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_humidite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2207,7 +2221,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_securite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2335,7 +2350,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_electricite_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2556,7 +2572,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_nuisibles_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2633,7 +2650,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_bruit_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2710,7 +2728,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_lumiere_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2758,7 +2777,8 @@
                 "label": "Suivant",
                 "slug": "desordres_logement_proprete_next",
                 "action": "resolve.save:findNextScreen",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2820,7 +2840,8 @@
                 "customCss": "fr-mb-3v",
                 "conditional": {
                   "show": "(formStore.data.signalement_concerne_profil_detail_tiers === 'tiers_particulier' || formStore.data.signalement_concerne_profil_detail_tiers === 'tiers_pro' || formStore.data.signalement_concerne_profil_detail_tiers === 'bailleur') && formStore.hasDesordre('desordres_') === false"
-                }
+                },
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2830,7 +2851,8 @@
                 "customCss": "fr-mb-3v",
                 "conditional": {
                   "show": "formStore.data.signalement_concerne_profil_detail_tiers === 'service_secours' && formStore.hasDesordre('desordres_') === false"
-                }
+                },
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -2850,7 +2872,8 @@
                 "customCss": "fr-mb-3v",
                 "conditional": {
                   "show": "formStore.hasDesordre('desordres_') === true"
-                }
+                },
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_bailleur.json b/assets/json/Signalement/questions_profile_bailleur.json
index b14c30a1e..6aea61599 100644
--- a/assets/json/Signalement/questions_profile_bailleur.json
+++ b/assets/json/Signalement/questions_profile_bailleur.json
@@ -75,7 +75,8 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_tiers_next",
                 "action": "goto.save:coordonnees_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -159,7 +160,8 @@
                 "label": "Suivant",
                 "slug": "coordonnees_occupant_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -229,7 +231,8 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -410,7 +413,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -504,7 +508,8 @@
                 "type": "SignalementFormButton",
                 "label": "Suivant",
                 "slug": "composition_logement_next",
-                "action": "goto.save:type_logement_commodites"
+                "action": "goto.save:type_logement_commodites",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -718,7 +723,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -780,7 +786,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -932,7 +939,8 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_situation_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -970,7 +978,8 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_situation_occupant_next",
                 "action": "goto.save:logement_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1079,7 +1088,8 @@
                 "label": "Suivant",
                 "slug": "logement_social_next",
                 "action": "goto.save:travailleur_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1177,7 +1187,8 @@
                 "label": "Suivant",
                 "slug": "travailleur_social_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1298,7 +1309,8 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1352,7 +1364,8 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1537,7 +1550,8 @@
                 "label": "Enregistrer",
                 "slug": "informations_complementaires_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1577,7 +1591,8 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_bailleur_occupant.json b/assets/json/Signalement/questions_profile_bailleur_occupant.json
index b45094878..03fb0830d 100644
--- a/assets/json/Signalement/questions_profile_bailleur_occupant.json
+++ b/assets/json/Signalement/questions_profile_bailleur_occupant.json
@@ -94,7 +94,8 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_occupant_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -164,7 +165,8 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -345,7 +347,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -439,7 +442,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_next",
                 "action": "goto.save:type_logement_commodites",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -653,7 +657,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -715,7 +720,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -797,7 +803,8 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_situation_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -835,7 +842,8 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_situation_occupant_next",
                 "action": "goto.save:logement_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -960,7 +968,8 @@
                 "label": "Suivant",
                 "slug": "logement_social_next",
                 "action": "goto.save:travailleur_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1032,7 +1041,8 @@
                 "label": "Suivant",
                 "slug": "travailleur_social_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1172,7 +1182,8 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1226,7 +1237,8 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1354,7 +1366,8 @@
                 "label": "Enregistrer",
                 "slug": "informations_complementaires_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1394,7 +1407,8 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_locataire.json b/assets/json/Signalement/questions_profile_locataire.json
index 8cd09303d..4bfbc99f5 100644
--- a/assets/json/Signalement/questions_profile_locataire.json
+++ b/assets/json/Signalement/questions_profile_locataire.json
@@ -69,18 +69,28 @@
       ],
       "footer": [
         {
-          "type": "SignalementFormButton",
-          "label": "Précédent",
-          "slug": "vos_coordonnees_occupant_previous",
-          "action": "goto:signalement_concerne",
-          "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line"
-        },
-        {
-          "type": "SignalementFormButton",
-          "label": "Suivant",
-          "slug": "vos_coordonnees_occupant_next",
-          "action": "goto.save:coordonnees_bailleur",
-          "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+          "type": "SignalementFormSubscreen",
+          "slug": "vos_coordonnees_occupant_footer",
+          "customCss": "button-group-responsive-inverted",
+          "components": {
+            "body": [
+              {
+                "type": "SignalementFormButton",
+                "label": "Suivant",
+                "slug": "vos_coordonnees_occupant_next",
+                "action": "goto.save:coordonnees_bailleur",
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
+              },
+              {
+                "type": "SignalementFormButton",
+                "label": "Précédent",
+                "slug": "vos_coordonnees_occupant_previous",
+                "action": "goto:signalement_concerne",
+                "customCss": "fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line"
+              }
+            ]
+          }
         }
       ]
     }
@@ -191,7 +201,8 @@
                 "label": "Suivant",
                 "slug": "coordonnees_bailleur_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -261,7 +272,8 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -442,7 +454,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -536,7 +549,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_next",
                 "action": "goto.save:type_logement_commodites",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -750,7 +764,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -812,7 +827,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -970,7 +986,8 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_situation_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1008,7 +1025,8 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_situation_occupant_next",
                 "action": "goto.save:logement_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1133,7 +1151,8 @@
                 "label": "Suivant",
                 "slug": "logement_social_next",
                 "action": "goto.save:travailleur_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1219,7 +1238,8 @@
                 "label": "Suivant",
                 "slug": "travailleur_social_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1384,7 +1404,8 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1443,7 +1464,8 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1582,7 +1604,8 @@
                 "label": "Enregistrer",
                 "slug": "informations_complementaires_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1622,7 +1645,8 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_service_secours.json b/assets/json/Signalement/questions_profile_service_secours.json
index 405471969..53e15ea40 100644
--- a/assets/json/Signalement/questions_profile_service_secours.json
+++ b/assets/json/Signalement/questions_profile_service_secours.json
@@ -75,7 +75,8 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_tiers_next",
                 "action": "goto.save:coordonnees_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -162,7 +163,8 @@
                 "label": "Suivant",
                 "slug": "coordonnees_occupant_next",
                 "action": "goto.save:coordonnees_bailleur",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -278,7 +280,8 @@
                 "label": "Suivant",
                 "slug": "coordonnees_bailleur_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -348,7 +351,8 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -529,7 +533,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -624,7 +629,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_next",
                 "action": "goto.save:type_logement_commodites",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -838,7 +844,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -885,7 +892,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1037,7 +1045,8 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1186,7 +1195,8 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1249,7 +1259,8 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1289,7 +1300,8 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_tiers_particulier.json b/assets/json/Signalement/questions_profile_tiers_particulier.json
index 3154fa54a..447cbd563 100644
--- a/assets/json/Signalement/questions_profile_tiers_particulier.json
+++ b/assets/json/Signalement/questions_profile_tiers_particulier.json
@@ -86,7 +86,8 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_tiers_next",
                 "action": "goto.save:coordonnees_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -170,7 +171,8 @@
                 "label": "Suivant",
                 "slug": "coordonnees_occupant_next",
                 "action": "goto.save:coordonnees_bailleur",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -286,7 +288,8 @@
                 "label": "Suivant",
                 "slug": "coordonnees_bailleur_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -356,7 +359,8 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -537,7 +541,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -632,7 +637,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_next",
                 "action": "goto.save:type_logement_commodites",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -846,7 +852,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -908,7 +915,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1060,7 +1068,8 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_situation_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1098,7 +1107,8 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_situation_occupant_next",
                 "action": "goto.save:logement_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1207,7 +1217,8 @@
                 "label": "Suivant",
                 "slug": "logement_social_next",
                 "action": "goto.save:travailleur_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1305,7 +1316,8 @@
                 "label": "Suivant",
                 "slug": "travailleur_social_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1454,7 +1466,8 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1513,7 +1526,8 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1667,7 +1681,8 @@
                 "label": "Enregistrer",
                 "slug": "informations_complementaires_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1707,7 +1722,8 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_tiers_pro.json b/assets/json/Signalement/questions_profile_tiers_pro.json
index a96205576..8e23e7549 100644
--- a/assets/json/Signalement/questions_profile_tiers_pro.json
+++ b/assets/json/Signalement/questions_profile_tiers_pro.json
@@ -71,7 +71,8 @@
                 "label": "Suivant",
                 "slug": "vos_coordonnees_tiers_next",
                 "action": "goto.save:coordonnees_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -155,7 +156,8 @@
                 "label": "Suivant",
                 "slug": "coordonnees_occupant_next",
                 "action": "goto.save:coordonnees_bailleur",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -268,7 +270,8 @@
                 "label": "Suivant",
                 "slug": "coordonnees_bailleur_next",
                 "action": "goto.save:zone_concernee",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -338,7 +341,8 @@
                 "label": "Suivant",
                 "slug": "zone_concernee_zone_next",
                 "action": "goto.save:ecran_intermediaire_type_composition",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -519,7 +523,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_next",
                 "action": "goto.save:composition_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -614,7 +619,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_next",
                 "action": "goto.save:type_logement_commodites",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -828,7 +834,8 @@
                 "label": "Suivant",
                 "slug": "type_logement_commodites_next",
                 "action": "goto.save:composition_logement_personnes",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -890,7 +897,8 @@
                 "label": "Suivant",
                 "slug": "composition_logement_personnes_next",
                 "action": "goto.save:bail_dpe",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1042,7 +1050,8 @@
                 "label": "Suivant",
                 "slug": "bail_dpe_next",
                 "action": "goto.save:ecran_intermediaire_situation_occupant",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1080,7 +1089,8 @@
                 "label": "Suivant",
                 "slug": "ecran_intermediaire_situation_occupant_next",
                 "action": "goto.save:logement_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1189,7 +1199,8 @@
                 "label": "Suivant",
                 "slug": "logement_social_next",
                 "action": "goto.save:travailleur_social",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1298,7 +1309,8 @@
                 "label": "Suivant",
                 "slug": "travailleur_social_next",
                 "action": "goto.save:ecran_intermediaire_les_desordres",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1447,7 +1459,8 @@
                 "label": "Suivant",
                 "slug": "info_procedure_utilisation_service_next",
                 "action": "goto.save:utilisation_service",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1506,7 +1519,8 @@
                 "label": "Suivant",
                 "slug": "utilisation_service_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1660,7 +1674,8 @@
                 "label": "Enregistrer",
                 "slug": "informations_complementaires_next",
                 "action": "goto.save:validation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -1700,7 +1715,8 @@
                 "label": "Valider mon signalement",
                 "slug": "validation_signalement_next",
                 "action": "goto.save:confirmation_signalement",
-                "customCss": "fr-btn--icon-left fr-icon-check-line"
+                "customCss": "fr-btn--icon-left fr-icon-check-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/json/Signalement/questions_profile_tous.json b/assets/json/Signalement/questions_profile_tous.json
index 34c1ee2ab..23fa6b454 100644
--- a/assets/json/Signalement/questions_profile_tous.json
+++ b/assets/json/Signalement/questions_profile_tous.json
@@ -58,7 +58,8 @@
                 "label": "C'est parti",
                 "slug": "adresse_logement_intro_go",
                 "action": "goto:adresse_logement",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormLink",
@@ -151,7 +152,8 @@
                 "label": "Suivant",
                 "slug": "adresse_logement_next",
                 "action": "goto.checkloc:signalement_concerne",
-                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line"
+                "customCss": "fr-btn--icon-right fr-icon-arrow-right-line",
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -340,7 +342,8 @@
                 "action": "goto.save:vos_coordonnees_occupant",
                 "conditional": {
                   "show": "formStore.data.signalement_concerne_profil === 'logement_occupez'"
-                }
+                },
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
@@ -350,7 +353,8 @@
                 "action": "goto.save:vos_coordonnees_tiers",
                 "conditional": {
                   "show": "formStore.data.signalement_concerne_profil === 'autre_logement'"
-                }
+                },
+                "validOnEnter": true
               },
               {
                 "type": "SignalementFormButton",
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue
index 1bd999637..f14170fd2 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormAddress.vue
@@ -85,7 +85,8 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     const updatedSubscreenData = subscreenManager.generateSubscreenData(this.id, subscreenData.body, this.validate)
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue
index d7a593dd4..bc707ca24 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormAutocomplete.vue
@@ -62,7 +62,8 @@ export default defineComponent({
     // mais si on ne les met pas, elles apparaissent dans le DOM
     // et ça soulève des erreurs W3C
     clickEvent: Function,
-    handleClickComponent: Function
+    handleClickComponent: Function,
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue
index 0a0ccb98d..48f7b6e6e 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormButton.vue
@@ -57,10 +57,18 @@ export default defineComponent({
   },
   mounted () {
     const element = this.$refs.button as HTMLElement
-    if (this.access_focus && element && !element.classList.contains('fr-hidden')) {
-      this.focusInput()
+    if (element && !element.classList.contains('fr-hidden')) {
+      if (this.access_focus) {
+        this.focusInput()
+      }
+      if (this.validOnEnter) {
+        window.addEventListener('keyup', this.handleGlobalEnter)
+      }
     }
   },
+  beforeUnmount () {
+    window.removeEventListener('keyup', this.handleGlobalEnter)
+  },
   computed: {
     actionType (): string {
       if (this.action.includes(':')) {
@@ -86,6 +94,11 @@ export default defineComponent({
       if (focusableElement) {
         focusableElement.focus()
       }
+    },
+    handleGlobalEnter (event: KeyboardEvent) {
+      if (event.key === 'Enter') {
+        this.handleClick()
+      }
     }
   }
 })
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormCheckbox.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormCheckbox.vue
index c2be71211..718253ca8 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormCheckbox.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormCheckbox.vue
@@ -49,7 +49,8 @@ export default defineComponent({
     clickEvent: Function,
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
-    access_autocomplete: { type: String, default: '' }
+    access_autocomplete: { type: String, default: '' },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormConfirmation.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormConfirmation.vue
index afcf2f3cc..c8187b385 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormConfirmation.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormConfirmation.vue
@@ -30,7 +30,8 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
     access_autocomplete: { type: String, default: '' },
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   }
 })
 </script>
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormCounter.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormCounter.vue
index e6a86abd1..691a0fe97 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormCounter.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormCounter.vue
@@ -49,7 +49,8 @@ export default defineComponent({
     handleClickComponent: Function,
     clickEvent: Function,
     access_name: { type: String, default: undefined },
-    access_autocomplete: { type: String, default: undefined }
+    access_autocomplete: { type: String, default: undefined },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormDate.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormDate.vue
index 14a155cf3..519a8b461 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormDate.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormDate.vue
@@ -43,7 +43,8 @@ export default defineComponent({
     handleClickComponent: Function,
     clickEvent: Function,
     access_name: { type: String, default: undefined },
-    access_autocomplete: { type: String, default: undefined }
+    access_autocomplete: { type: String, default: undefined },
+    validOnEnter: { type: Boolean, default: false }
   },
   mounted () {
     const element = this.$refs.date as HTMLElement
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryItem.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryItem.vue
index bb56e2e91..fcc2a04a4 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryItem.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryItem.vue
@@ -36,7 +36,8 @@ export default defineComponent({
     iconSrc: { type: String, default: '' },
     modelValue: { type: Boolean, default: false },
     clickEvent: Function,
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryList.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryList.vue
index 0ceb0adaf..6fa7b92f0 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryList.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderCategoryList.vue
@@ -41,7 +41,8 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
     access_autocomplete: { type: String, default: '' },
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderOverview.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderOverview.vue
index 6549dd3ed..af3732146 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderOverview.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormDisorderOverview.vue
@@ -143,7 +143,8 @@ export default defineComponent({
     clickEvent: Function,
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
-    access_autocomplete: { type: String, default: '' }
+    access_autocomplete: { type: String, default: '' },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormEmailfield.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormEmailfield.vue
index abc6e58da..5f9401740 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormEmailfield.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormEmailfield.vue
@@ -49,7 +49,8 @@ export default defineComponent({
     // mais si on ne les met pas, elles apparaissent dans le DOM
     // et ça soulève des erreurs W3C
     clickEvent: Function,
-    handleClickComponent: Function
+    handleClickComponent: Function,
+    validOnEnter: { type: Boolean, default: false }
   },
   computed: {
     internalValue: {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormInfo.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormInfo.vue
index 725b97213..880b88d03 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormInfo.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormInfo.vue
@@ -26,7 +26,8 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
     access_autocomplete: { type: String, default: '' },
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormLink.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormLink.vue
index 26da71067..6b71a2e6f 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormLink.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormLink.vue
@@ -37,7 +37,8 @@ export default defineComponent({
     // et ça soulève des erreurs W3C
     hasError: { type: Boolean, default: undefined },
     access_name: { type: String, default: undefined },
-    access_autocomplete: { type: String, default: undefined }
+    access_autocomplete: { type: String, default: undefined },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormModal.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormModal.vue
index 81f944932..bfad1e951 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormModal.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormModal.vue
@@ -49,7 +49,8 @@ export default defineComponent({
     hasError: { type: Boolean, default: undefined },
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   },
   methods: {
     closeModal () {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormOnlyChoice.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormOnlyChoice.vue
index 06bc586fa..e5ad45d59 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormOnlyChoice.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormOnlyChoice.vue
@@ -62,7 +62,8 @@ export default defineComponent({
     clickEvent: Function,
     handleClickComponent: Function,
     access_name: { type: String, default: undefined },
-    access_autocomplete: { type: String, default: undefined }
+    access_autocomplete: { type: String, default: undefined },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormOverview.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormOverview.vue
index 4b6498138..fef0f5196 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormOverview.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormOverview.vue
@@ -209,7 +209,8 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
     access_autocomplete: { type: String, default: '' },
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormPhonefield.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormPhonefield.vue
index 939f8b0a2..435c3761e 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormPhonefield.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormPhonefield.vue
@@ -131,7 +131,8 @@ export default defineComponent({
     // mais si on ne les met pas, elles apparaissent dans le DOM
     // et ça soulève des erreurs W3C
     modelValue: { type: String, default: null },
-    handleClickComponent: Function
+    handleClickComponent: Function,
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     if (formStore.data[this.id + '_countrycode'] === '' || formStore.data[this.id + '_countrycode'] === undefined) {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormRoomList.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormRoomList.vue
index 73beec74c..3d2e0c306 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormRoomList.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormRoomList.vue
@@ -71,7 +71,8 @@ export default defineComponent({
     // et ça soulève des erreurs W3C
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
-    access_autocomplete: { type: String, default: '' }
+    access_autocomplete: { type: String, default: '' },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormSubscreen.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormSubscreen.vue
index 493ddbc62..f40e78c84 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormSubscreen.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormSubscreen.vue
@@ -104,7 +104,8 @@ export default defineComponent({
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
     access_focus: { type: Boolean, default: false },
-    clickEvent: Function
+    clickEvent: Function,
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormTextarea.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormTextarea.vue
index c06d67ad0..67d23207c 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormTextarea.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormTextarea.vue
@@ -50,7 +50,8 @@ export default defineComponent({
     handleClickComponent: Function,
     access_name: { type: String, default: '' },
     access_autocomplete: { type: String, default: '' },
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   },
   computed: {
     internalValue: {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormTextfield.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormTextfield.vue
index def26b21c..53f933e85 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormTextfield.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormTextfield.vue
@@ -56,7 +56,8 @@ export default defineComponent({
     // mais si on ne les met pas, elles apparaissent dans le DOM
     // et ça soulève des erreurs W3C
     clickEvent: Function,
-    handleClickComponent: Function
+    handleClickComponent: Function,
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
@@ -89,11 +90,7 @@ export default defineComponent({
       }
     },
     focusInput () {
-      // console.log('focusInput textfield')
-      // console.log(this.id + '_ref')
-      // console.log(this.$refs)
       const focusableElement = (this.$refs[this.id + '_ref']) as HTMLElement
-      // console.log(focusableElement)
       if (focusableElement) {
         focusableElement.focus()
       }
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormUpload.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormUpload.vue
index e6d463ee1..c8dee9306 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormUpload.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormUpload.vue
@@ -85,7 +85,8 @@ export default defineComponent({
     clickEvent: Function,
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormUploadPhotos.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormUploadPhotos.vue
index 919c9863c..e0b62f800 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormUploadPhotos.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormUploadPhotos.vue
@@ -46,7 +46,8 @@ export default defineComponent({
     clickEvent: Function,
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {
diff --git a/assets/scripts/vue/components/signalement-form/components/SignalementFormWarning.vue b/assets/scripts/vue/components/signalement-form/components/SignalementFormWarning.vue
index b31f40300..1edd25a1f 100644
--- a/assets/scripts/vue/components/signalement-form/components/SignalementFormWarning.vue
+++ b/assets/scripts/vue/components/signalement-form/components/SignalementFormWarning.vue
@@ -26,7 +26,8 @@ export default defineComponent({
     clickEvent: Function,
     access_name: { type: String, default: undefined },
     access_autocomplete: { type: String, default: undefined },
-    access_focus: { type: Boolean, default: false }
+    access_focus: { type: Boolean, default: false },
+    validOnEnter: { type: Boolean, default: false }
   },
   data () {
     return {