diff --git a/View/GrouperGroups/base.ctp b/View/GrouperGroups/base.ctp
index 49e5f20..8afa2cb 100644
--- a/View/GrouperGroups/base.ctp
+++ b/View/GrouperGroups/base.ctp
@@ -27,4 +27,9 @@ $this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => '
             btn.find('i').removeClass('fa-caret-down').addClass('fa-caret-right');
         }
     })
+
+    $('.collapse-wg-working-group-parent').on('hide.bs.collapse', function(ev) {
+        $(this).siblings('.collapse-wg-working-group').collapse('hide');
+        $(this).parent().find('.collapse-btn .fa-caret-down').removeClass('fa-caret-down').addClass('fa-caret-right');
+    });
 </script>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index 0bdcb07..c5d6d16 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -82,7 +82,7 @@ $numColumns = count($columns);
             <tbody>
                 <tr class="table-secondary">
                     <td colspan="<?php echo $numColumns; ?>">
-                        <button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0" data-toggle="collapse" data-target=".collapse-wg-working-group-parent" role="button" aria-expanded="false">
+                        <button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0 work-group-heading-btn" data-toggle="collapse" data-target=".collapse-wg-working-group-parent" role="button" aria-expanded="false">
                             Working groups
                             <i class="fa fa-caret-down fa-sm"></i>
                         </button>
@@ -128,7 +128,7 @@ $numColumns = count($columns);
                         </td>
                     </tr>
                     <?php foreach ($wggroup['Groups'] as $key => $group) : ?>
-                        <tr class="collapse collapse-wg-<?php echo $wggroup['WGName']; ?>" id="collapse-wg-<?php echo $wggroup['WGName'] . '-' . $key; ?>">
+                        <tr class="collapse collapse-wg-working-group collapse-wg-<?php echo $wggroup['WGName']; ?>" id="collapse-wg-<?php echo $wggroup['WGName'] . '-' . $key; ?>">
                             <td class="pl-3">
                                 <?php echo $group['WGApp'] ?? "No Name"; ?>
                             </td>
@@ -161,4 +161,5 @@ $numColumns = count($columns);
         <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
     </div>
 <?php endif; ?>
+
 <?php echo $this->element('Components/subscriberList'); ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index abeced4..81a9584 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -179,4 +179,6 @@ $numColumns = count($columns);
     <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
   </div>
 <?php endif; ?>
+
+
 <?php echo $this->element('Components/subscriberList'); ?>
\ No newline at end of file