diff --git a/src/opnsense/mvc/app/views/layout_partials/base_dialog.volt b/src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
index fd63f8f39..765c89ace 100644
--- a/src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
+++ b/src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
@@ -109,14 +109,18 @@
           <tr{% if field['advanced']|default(false)=='true' %} data-advanced="true"{% endif %}>
             <th colspan="3">
                 <div style="padding-bottom: 5px; padding-top: 5px; font-size: 16px;">
+                    {% if field['collapse']|default(false)=='true' %}
+                    <i class="fa fa-angle-right" aria-hidden="true"></i>
+                    {% else %}
                     <i class="fa fa-angle-down" aria-hidden="true"></i>
+                    {% endif %}
                     &nbsp;
                     <b>{{field['label']}}</b>
                 </div>
             </th>
           </tr>
         </thead>
-        <tbody class="collapsible">
+        <tbody class="collapsible" {% if field['collapse']|default(false)=='true' %}style="display: none;"{%endif%}>
 {#- endmacro #}
 
                             {% else %}
diff --git a/src/opnsense/mvc/app/views/layouts/default.volt b/src/opnsense/mvc/app/views/layouts/default.volt
index 7c7ce6a42..f54c8d829 100644
--- a/src/opnsense/mvc/app/views/layouts/default.volt
+++ b/src/opnsense/mvc/app/views/layouts/default.volt
@@ -119,13 +119,13 @@
                     if (collapse != undefined && id !== undefined && id === "collapsible") {
                         let icon = $('> tr > th > div > i', event.currentTarget);
                         if (collapse.is(':hidden')) {
-                            collapse.fadeIn(150);
+                            collapse.toggle(0);
                             collapse.css('display', '');
                             icon.toggleClass("fa-angle-right fa-angle-down");
                             return;
                         }
                         icon.toggleClass("fa-angle-down fa-angle-right");
-                        $('> tr > td', collapse).fadeToggle(150);
+                        $('> tr > td', collapse).toggle(0);
                     }
                 });