diff --git a/panels.module b/panels.module
index 4bb3bad..848a399 100644
--- a/panels.module
+++ b/panels.module
@@ -1791,7 +1791,7 @@ function panels_get_path($file, $base_path = FALSE, $module = 'panels') {
  * Remove default sidebar related body classes and provide own css classes
  */
 function panels_preprocess_html(&$vars) {
-  $panel_body_css = &drupal_static('panel_body_css');
+  $panel_body_css = &drupal_static('panel_body_css', array());
   if (!empty($panel_body_css['body_classes_to_remove'])) {
     $classes_to_remove = explode(' ', $panel_body_css['body_classes_to_remove']);
     foreach ($vars['classes_array'] as $key => $css_class) {
diff --git a/plugins/task_handlers/panel_context.inc b/plugins/task_handlers/panel_context.inc
index c3bb07f..eb81287 100644
--- a/plugins/task_handlers/panel_context.inc
+++ b/plugins/task_handlers/panel_context.inc
@@ -315,13 +315,15 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
   }
 
   // Remove and add body element classes
-  $panel_body_css = &drupal_static('panel_body_css');
+  $panel_body_css = &drupal_static('panel_body_css', array());
 
-  if (isset($handler->conf['body_classes_to_remove']) && !isset($panel_body_css['body_classes_to_remove'])) {
-    $panel_body_css['body_classes_to_remove'] = $handler->conf['body_classes_to_remove'];
+  if (isset($handler->conf['body_classes_to_remove'])) {
+    $panel_body_css += array('body_classes_to_remove' => '');
+    $panel_body_css['body_classes_to_remove'] = trim($panel_body_css['body_classes_to_remove'] . ' ' . $handler->conf['body_classes_to_remove']);
   }
-  if (isset($handler->conf['body_classes_to_add']) && !isset($panel_body_css['body_classes_to_add'])) {
-    $panel_body_css['body_classes_to_add'] = $handler->conf['body_classes_to_add'];
+  if (isset($handler->conf['body_classes_to_add'])) {
+    $panel_body_css += array('body_classes_to_add' => '');
+    $panel_body_css['body_classes_to_add'] = trim($panel_body_css['body_classes_to_add'] . ' ' . $handler->conf['body_classes_to_add']);
   }
 
   $info = array(
