diff --git a/templates/components/form/fields_macros.html.twig b/templates/components/form/fields_macros.html.twig
index 100c944deb7..8b015a8c294 100644
--- a/templates/components/form/fields_macros.html.twig
+++ b/templates/components/form/fields_macros.html.twig
@@ -845,13 +845,18 @@
       'align_label_right': true,
       'mb': 'mb-2',
       'field_class': 'col-12 col-sm-6',
-      'label_class': 'col-xxl-5',
-      'input_class': 'col-xxl-7',
       'add_field_class': '',
       'add_field_attribs': {},
       'center': false,
    }|merge(options) %}
 
+   {% if options.icon_label %}
+      {% set options = {
+         label_class: 'col-2',
+         input_class: 'col-10',
+      }|merge(options) %}
+   {% endif %}
+
    {% if options.full_width %}
       {% set options = options|merge({
          field_class: 'col-12',
@@ -865,12 +870,10 @@
       {% endif %}
    {% endif %}
 
-   {% if options.icon_label %}
-      {% set options = {
-         label_class: 'col-2',
-         input_class: 'col-10',
-      }|merge(options) %}
-   {% endif %}
+   {% set options = {
+      label_class: 'col-xxl-5',
+      input_class: 'col-xxl-7',
+   }|merge(options) %}
 
    {% if options.align_label_right %}
       {% set options = options|merge({