diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache
index 02fae325..083f8a83 100644
--- a/lib/gollum/frontend/templates/page.mustache
+++ b/lib/gollum/frontend/templates/page.mustache
@@ -7,7 +7,7 @@ Mousetrap.bind(['e'], function( e ) {
 </script>
 <div id="wiki-wrapper" class="page">
 <div id="head">
-  <h1>{{title}}</h1>
+  <h1>{{page_header}}</h1>
   <ul class="actions">
     <li class="minibutton">
       {{>searchbar}}
diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb
index 7fe4e921..9d98263f 100644
--- a/lib/gollum/frontend/views/page.rb
+++ b/lib/gollum/frontend/views/page.rb
@@ -8,11 +8,15 @@ module Precious
       DEFAULT_AUTHOR = 'you'
 
       def title
-        extract_title(@content) || @page.url_path.gsub("-", " ")
+        @page.url_path.gsub("-", " ")
+      end
+
+      def page_header
+        page_header_from_content(@content) || title
       end
 
       def content
-        without_title(@content)
+        content_without_page_header(@content)
       end
 
       def author
@@ -126,7 +130,7 @@ module Precious
 
       # Extracts title from page if present.
       #
-      def extract_title(content)
+      def page_header_from_content(content)
         doc = build_document(content)
         title = find_header_node(doc)
         Sanitize.clean(title.to_html).strip unless title.empty?
@@ -134,7 +138,7 @@ module Precious
 
       # Returns page content without title if it was extracted.
       #
-      def without_title(content)
+      def content_without_page_header(content)
         doc = build_document(content)
         title = find_header_node(doc)
         title.remove unless title.empty?