diff --git a/plugins/task_handlers/panel_context.inc b/plugins/task_handlers/panel_context.inc
index c3bb07f..77366e1 100644
--- a/plugins/task_handlers/panel_context.inc
+++ b/plugins/task_handlers/panel_context.inc
@@ -317,11 +317,21 @@ 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');
 
-  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 (!empty($handler->conf['body_classes_to_remove'])) {
+    if (!empty($panel_body_css['body_classes_to_remove'])) {
+      $panel_body_css['body_classes_to_remove'] .= ' ' . $handler->conf['body_classes_to_remove'];
+    }
+    else {
+      $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 (!empty($handler->conf['body_classes_to_add'])) {
+    if (!empty($panel_body_css['body_classes_to_add'])) {
+      $panel_body_css['body_classes_to_add'] .= ' ' . $handler->conf['body_classes_to_add'];
+    }
+    else {
+      $panel_body_css['body_classes_to_add'] = $handler->conf['body_classes_to_add'];
+    }
   }
 
   $info = array(