diff --git a/panels.module b/panels.module
index 4bb3bad..a6a658e 100644
--- a/panels.module
+++ b/panels.module
@@ -1101,7 +1101,7 @@ function panels_render_display(&$display, $renderer = NULL) {
   ctools_include('plugins', 'panels');
   ctools_include('context');
 
-  if (!empty($display->context)) {
+  if (!empty($display->context) && (!isset($display->task_name) || ($display->task_name != 'site_template'))) {
     if ($form_context = ctools_context_get_form($display->context)) {
       $form_context->form['#theme'] = 'panels_render_display_form';
       if (empty($form_context->form['#theme_wrappers']) || !in_array('form', $form_context->form['#theme_wrappers'])) {
diff --git a/plugins/task_handlers/panel_context.inc b/plugins/task_handlers/panel_context.inc
index c3bb07f..7c9974a 100644
--- a/plugins/task_handlers/panel_context.inc
+++ b/plugins/task_handlers/panel_context.inc
@@ -291,6 +291,7 @@ function panels_panel_context_render($handler, $base_contexts, $args, $test = TR
 
   $display->cache_key = panels_panel_context_cache_key($task_name, $handler->name, $args);
 
+  $display->task_name = $task_name;
   // Check to see if there is any CSS.
   if (!empty($handler->conf['css'])) {
     ctools_include('css');