diff --git a/panopoly_widgets.module b/panopoly_widgets.module
index 22fccc9..18205ff 100644
--- a/panopoly_widgets.module
+++ b/panopoly_widgets.module
@@ -462,3 +462,29 @@ function panopoly_widgets_menu_block_tree_alter($tree, $config) {
     }
   }
 }
+
+/**
+ * Implements hook_views_pre_render().
+ */
+function panopoly_widgets_views_pre_render(&$view) {
+  if ($view->name == 'panopoly_widgets_general_content' && $view->current_display == 'piece_of_content') {
+    $display =& $view->display[$view->current_display];
+    $row_plugin =& $view->style_plugin->row_plugin;
+
+    if (is_a($row_plugin, 'entity_views_plugin_row_entity_view')) {
+      $nid = $view->result[0]->nid;
+
+      // Move the title override to the node itself.
+      $overridden_title = $display->handler->options['title'];
+      if (!empty($overridden_title)) {
+        // No need for check_plain() here because node rendering checks it already.
+        $row_plugin->rendered_content[$nid]['#node']->title = $overridden_title;
+        unset($display->handler->options['title']);
+
+        if (isset($row_plugin->rendered_content[$nid]['#panelizer_content'])) {
+          $row_plugin->rendered_content[$nid]['#panelizer_content']['title'] = check_plain($overridden_title);
+        }
+      }
+    }
+  }
+}
diff --git a/panopoly_widgets.views_default.inc b/panopoly_widgets.views_default.inc
index adcdfe7..c0d7883 100644
--- a/panopoly_widgets.views_default.inc
+++ b/panopoly_widgets.views_default.inc
@@ -224,7 +224,7 @@ function panopoly_widgets_views_default_views() {
   $handler->display->display_options['allow']['link_to_view'] = 0;
   $handler->display->display_options['allow']['more_link'] = 0;
   $handler->display->display_options['allow']['path_override'] = 0;
-  $handler->display->display_options['allow']['title_override'] = 0;
+  $handler->display->display_options['allow']['title_override'] = 'title_override';
   $handler->display->display_options['allow']['exposed_form'] = 'exposed_form';
   $handler->display->display_options['allow']['fields_override'] = 'fields_override';
   $export['panopoly_widgets_general_content'] = $view;