diff --git a/addons/survey/static/src/js/fields_section_one2many.js b/addons/survey/static/src/js/fields_section_one2many.js
index 5a30b4f787d..72fa2e11f15 100644
--- a/addons/survey/static/src/js/fields_section_one2many.js
+++ b/addons/survey/static/src/js/fields_section_one2many.js
@@ -37,7 +37,7 @@ var SectionListRenderer = ListRenderer.extend({
         var isSection = record.data[this.sectionFieldName];
 
         if (isSection){
-            if (node.attrs.widget === "handle"){
+            if (node.attrs.widget === "handle" || node.attrs.name === "random_questions_count"){
                 return $cell;
             } else if (node.attrs.name === "title"){
                 var nbrColumns = this._getNumberOfCols();
@@ -47,6 +47,9 @@ var SectionListRenderer = ListRenderer.extend({
                 if (this.addTrashIcon){
                     nbrColumns--;
                 }
+                if (record.data.questions_selection === "random"){
+                    nbrColumns--;
+                }
                 $cell.attr('colspan', nbrColumns);
             } else {
                 $cell.removeClass('o_invisible_modifier');
diff --git a/addons/survey/views/survey_question_views.xml b/addons/survey/views/survey_question_views.xml
index 4f0056212f2..46c49033e18 100644
--- a/addons/survey/views/survey_question_views.xml
+++ b/addons/survey/views/survey_question_views.xml
@@ -19,7 +19,7 @@
                         <separator />
                         <field name="questions_selection" invisible="1"/>
                     </div>
-                    <group attrs="{'invisible': ['|', ('is_page', '=', False), ('questions_selection', '=', 'all')]}">
+                    <group class="o_label_nowrap" attrs="{'invisible': ['|', ('is_page', '=', False), ('questions_selection', '=', 'all')]}">
                         <field name="random_questions_count"/>
                     </group>
                     <group attrs="{'invisible': [('is_page', '=', True)]}">
diff --git a/addons/survey/views/survey_survey_views.xml b/addons/survey/views/survey_survey_views.xml
index 23ed5b191a6..dbdd3016afa 100644
--- a/addons/survey/views/survey_survey_views.xml
+++ b/addons/survey/views/survey_survey_views.xml
@@ -58,7 +58,7 @@
                                 <tree decoration-bf="is_page" editable="bottom">
                                     <field name="sequence" widget="handle"/>
                                     <field name="title"/>
-                                    <field name="question_type" attrs="{'invisible': [('is_page', '=', True)]}"/>
+                                    <field name="question_type" />
                                     <field name="is_page" invisible="1"/>
                                     <field name="questions_selection" invisible="1"/>
                                     <field name="random_questions_count" attrs="{'column_invisible': [('parent.questions_selection', '=', 'all')], 'invisible': [('is_page', '=', False)]}" />