diff --git a/plugins/styles/collapsible.inc b/plugins/styles/collapsible.inc
index e3e294d..943e825 100644
--- a/plugins/styles/collapsible.inc
+++ b/plugins/styles/collapsible.inc
@@ -52,6 +52,11 @@ function panels_style_collapsible_pane_settings_form($style_settings) {
     '#title' => t('Collapsed by default'),
     '#default_value' => isset($style_settings['pane_collapsed']) ? $style_settings['pane_collapsed'] : FALSE
   );
+  $form['pane_empty_check'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Strip HTML tags and check content on emptiness'),
+    '#default_value' => isset($style_settings['pane_empty_check']) ? $style_settings['pane_empty_check'] : TRUE,
+  );
   return $form;
 }
 
@@ -92,8 +97,12 @@ function theme_panels_style_collapsible_render_pane($vars) {
   $pane = $vars['pane'];
   $display = $vars['display'];
   $settings = $vars['settings'];
+  $check_empty = isset($settings['pane_empty_check']) ? $settings['pane_empty_check'] : TRUE;
 
-  if (empty($content->content)) {
+  if (empty($content->content) ||
+    ($check_empty && is_string($content->content) &&
+      empty(trim(strip_tags($content->content))))
+  ) {
     return;
   }