diff --git a/middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb b/middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb
index 365985b7..7bdfeb1e 100644
--- a/middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb
+++ b/middleman-core/lib/middleman-core/templates/default/source/layouts/layout.erb
@@ -7,7 +7,7 @@
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     
     <!-- Use title if it's in the page YAML frontmatter -->
-    <title><%= data.page.title || "The Middleman" %></title>
+    <title><%= current_page.data.title || "The Middleman" %></title>
     
     <%= stylesheet_link_tag "normalize", "all" %>
     <%= javascript_include_tag  "all" %>
diff --git a/middleman-core/lib/middleman-core/templates/html5/source/layouts/layout.erb b/middleman-core/lib/middleman-core/templates/html5/source/layouts/layout.erb
index 96b3da22..77b233b6 100755
--- a/middleman-core/lib/middleman-core/templates/html5/source/layouts/layout.erb
+++ b/middleman-core/lib/middleman-core/templates/html5/source/layouts/layout.erb
@@ -7,7 +7,7 @@
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <!-- Use title if it's in the page YAML frontmatter -->
-        <title><%= data.page.title || "HTML5 Boilerplate" %></title>
+        <title><%= current_page.data.title || "HTML5 Boilerplate" %></title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width">