diff --git a/addons/survey/views/survey_survey_views.xml b/addons/survey/views/survey_survey_views.xml
index 826c359db1d..4f258888e7a 100644
--- a/addons/survey/views/survey_survey_views.xml
+++ b/addons/survey/views/survey_survey_views.xml
@@ -89,10 +89,12 @@
                                     <field name="questions_layout" widget="radio"
                                         attrs="{'readonly': [('session_state', 'in', ['ready', 'in_progress'])]}"/>
                                     <field name="progression_mode" widget="radio" />
-                                    <label for="is_time_limited" string="Survey Time Limit"/>
-                                    <div>
+                                    <div colspan="2" class="o_checkbox_optional_field">
+                                        <label for="is_time_limited" string="Survey Time Limit"/>
                                         <field name="is_time_limited" nolabel="1"/>
-                                        <field name="time_limit" widget="float_time" attrs="{'invisible': [('is_time_limited', '=', False)]}" nolabel="1" class="oe_inline" /> <span attrs="{'invisible': [('is_time_limited', '=', False)]}"> minutes</span>
+                                        <div attrs="{'invisible': [('is_time_limited', '=', False)]}">
+                                            <field name="time_limit" widget="float_time" nolabel="1" class="oe_inline"/> minutes
+                                        </div>
                                     </div>
                                     <field name="questions_selection" widget="radio" />
                                     <field name="users_can_go_back" string="Back Button" attrs="{'invisible': [('questions_layout', '=', 'one_page')]}"/>
@@ -100,11 +102,13 @@
                                 <group string="Candidates" name="candidates">
                                     <field name="access_mode"/>
                                     <field name="users_login_required"/>
-                                    <label for="is_attempts_limited" string="Attempts Limit"
-                                           attrs="{'invisible': ['|', ('has_conditional_questions', '=', True), '&amp;', ('access_mode', '=', 'public'), ('users_login_required', '=', False)]}"/>
-                                    <div attrs="{'invisible': ['|', ('has_conditional_questions', '=', True), '&amp;', ('access_mode', '=', 'public'), ('users_login_required', '=', False)]}">
+                                    <div colspan="2" class="o_checkbox_optional_field"
+                                        attrs="{'invisible': ['|', ('has_conditional_questions', '=', True), '&amp;', ('access_mode', '=', 'public'), ('users_login_required', '=', False)]}">
+                                        <label for="is_attempts_limited" string="Attempts Limit"/>
                                         <field name="is_attempts_limited" nolabel="1"/>
-                                        <field name="attempts_limit" attrs="{'invisible': [('is_attempts_limited', '=', False)]}" nolabel="1" class="oe_inline" /> <span attrs="{'invisible': [('is_attempts_limited', '=', False)]}"> attempts</span>
+                                        <div attrs="{'invisible': [('is_attempts_limited', '=', False)]}">
+                                            <field name="attempts_limit" nolabel="1" class="oe_inline"/> attempts
+                                        </div>
                                     </div>
                                 </group>
                                 <group string="Scoring" name="scoring">