diff --git a/ds.field_ui.inc b/ds.field_ui.inc
index 06dd7b5..c99462e 100644
--- a/ds.field_ui.inc
+++ b/ds.field_ui.inc
@@ -1520,6 +1520,11 @@ function _ds_field_ui_table_layouts_preview(&$form, &$form_state, $ds_layouts, $
     $chosen_layout = $ds_layouts[$layout_string];
 
     if (empty($chosen_layout['flexible'])) {
+
+      if (isset($chosen_layout['module']) && $chosen_layout['module'] == 'panels') {
+        $layout_string = $chosen_layout['panels']['theme'];
+      }
+
       $selected = '<strong>' . $chosen_layout['label'] . '</strong>';
       $selected .= '<br/>' . t('The default template can be found in %path', array('%path' => $chosen_layout['path']));
       $suggestions = t('Template suggestions') . ':<ul>';
diff --git a/ds.module b/ds.module
index 265a4c2..c4345a2 100644
--- a/ds.module
+++ b/ds.module
@@ -952,6 +952,9 @@ function ds_entity_variables(&$vars) {
       }
     }
 
+    // Let other modules know we have rendered.
+    $vars['rendered_by_ds'] = TRUE;
+
     // Add a layout wrapper
     $vars['layout_wrapper'] = isset($layout['settings']['layout_wrapper']) ? $layout['settings']['layout_wrapper'] : 'div';
   }