diff --git a/hypha/static_src/src/javascript/apply/form-group-toggle.js b/hypha/static_src/src/javascript/apply/form-group-toggle.js
index afd7c0eb1b46e43ba61b4f005777871e102a235c..4e54533aadfee95cb1d4ca699d05df468f180414 100644
--- a/hypha/static_src/src/javascript/apply/form-group-toggle.js
+++ b/hypha/static_src/src/javascript/apply/form-group-toggle.js
@@ -7,9 +7,11 @@
         var $field_group = $('.field-group-' + i);
         if ($field_group.length) {
             var classes = 'field-group-wrapper field-group-wrapper-' + i;
-            if ($field_group.data('hidden')) {
-                classes += ' js-hidden';
-            }
+            $field_group.each(function () { // eslint-disable-line no-loop-func
+                if ($(this).data('hidden') && classes.indexOf('js-hidden') === -1) {
+                    classes += ' js-hidden';
+                }
+            });
             $field_group.wrapAll('<div class="' + classes + '" />');
         }
         else {