diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f02f20476da175220fe1a954114a3dc7cb35e55a..64bdbca8b743f66ca9946cb8ca20c9a14160e186 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -60,3 +60,4 @@ Fix broken query in term context config.
 #999302 by troky: ctools_jump_menu() needed updating to new form parameters.
 #964174: stylizer plugin theme delegation was in the wrong place, causing errors.
 #991658 by burlap: Fully load the "user" context for the logged in user because not all fields are in $user.
+#1014866 by das-peter: Smarter title panes.
diff --git a/views_content/plugins/content_types/views_panes.inc b/views_content/plugins/content_types/views_panes.inc
index 894c263f82e355548bf0064ddc8a0c31e68d9506..3f67c064f9df4287ce7e1a0d9934f0f9e48b812a 100644
--- a/views_content/plugins/content_types/views_panes.inc
+++ b/views_content/plugins/content_types/views_panes.inc
@@ -90,7 +90,7 @@ function _views_content_panes_content_type($view, $display) {
 
   $title = $display->handler->get_option('pane_title');
   if (!$title) {
-    $title = $view->name;
+    $title = t('@view: @display', array('@view' => $view->name, '@display' => $display->display_title));
   }
 
   $description = $display->handler->get_option('pane_description');