diff --git a/js/misc/_vertical-tabs.js b/js/misc/_vertical-tabs.js
index 69d188f..3127260 100644
--- a/js/misc/_vertical-tabs.js
+++ b/js/misc/_vertical-tabs.js
@@ -43,8 +43,8 @@ Drupal.behaviors.verticalTabs = {
         if ($(this).find('legend a').length) {
           $(this).find('legend').append('<div class="panel-title fieldset-legend">' + $(this).find('legend a').html() + '</div>');
           $(this).find('legend a').remove();
-          $(this).append($(this).find('.panel-collapse').html());
-          $(this).find('.panel-collapse').remove();
+          $(this).append($(this).children('.panel-collapse').html());
+          $(this).children('.panel-collapse').remove();
         }
         if (this.id == focusID) {
           tab_focus = $(this);
diff --git a/theme/bootstrap/bootstrap-panel.vars.php b/theme/bootstrap/bootstrap-panel.vars.php
index 228c726..de78d41 100644
--- a/theme/bootstrap/bootstrap-panel.vars.php
+++ b/theme/bootstrap/bootstrap-panel.vars.php
@@ -10,7 +10,7 @@
 function bootstrap_preprocess_bootstrap_panel(&$variables) {
   $element = &$variables['element'];
   $attributes = !empty($element['#attributes']) ? $element['#attributes'] : array();
-  $variables['attributes'] = drupal_attributes($attributes);
+  $variables['attributes'] = drupal_attributes($attributes + array('id' => $element['#id']));
   $variables['collapsible'] = $element['#collapsible'];
   $variables['collapsed'] = $element['#collapsed'];
   $variables['id'] = $element['#id'];