diff --git a/templates/bootstrap/bootstrap-panel.vars.php b/templates/bootstrap/bootstrap-panel.vars.php
index 8c06a574f2758e89e3c5c3b92e9c8096c2b16184..ced059dfda51f1a2499c4c5e17630a5dba747b59 100644
--- a/templates/bootstrap/bootstrap-panel.vars.php
+++ b/templates/bootstrap/bootstrap-panel.vars.php
@@ -18,6 +18,12 @@
  * @ingroup theme_preprocess
  */
 function bootstrap_preprocess_bootstrap_panel(array &$variables) {
+  // Temporarily provide field_group "support" until properly "fixed" upstream.
+  // @see https://www.drupal.org/project/bootstrap/issues/2910624
+  if (!empty($variables['element']['#group']->format_type) && $variables['element']['#group']->format_type == 'htab') {
+    $variables['element']['#collapsed'] = FALSE;
+  }
+
   $element = &$variables['element'];
 
   // Set the element's attributes.
@@ -44,11 +50,6 @@ function bootstrap_preprocess_bootstrap_panel(array &$variables) {
     // Remove collapsed class as it should only be applied to the body.
     _bootstrap_remove_class('collapsed', $element);
   }
-  // Force grouped fieldsets to not be collapsible (for vertical tabs).
-  if (!empty($element['#group'])) {
-    $variables['collapsible'] = FALSE;
-    $variables['collapsed'] = FALSE;
-  }
 
   // Generate a unique identifier for the fieldset wrapper.
   if (!isset($attributes['id'])) {