diff --git a/data/_html-template/_layouts/page.hbs b/data/_html-template/_layouts/page.hbs
index 1e4a2ffb..db700877 100644
--- a/data/_html-template/_layouts/page.hbs
+++ b/data/_html-template/_layouts/page.hbs
@@ -2,7 +2,7 @@
 <html lang="{{ language }}">
     <head>
         <meta charset="UTF-8">
-        <title>{{ title }}</title>
+        <title>{{ page-title }}</title>
         <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
         <meta name="description" content="{{ description }}">
         <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -63,7 +63,7 @@
                        {{#translation-links}}{{/translation-links}}
                    </div>
 
-                    <h1 class="menu-title">{{ title }}</h1>
+                    <h1 class="menu-title">{{ page-title }}</h1>
 
                     <div class="right-buttons">
                         <i id="print-button" class="fa fa-print" title="Print this book"></i>
diff --git a/src/renderer/html_handlebars/hbs_renderer.rs b/src/renderer/html_handlebars/hbs_renderer.rs
index 9d4f06b3..0b00a0e1 100644
--- a/src/renderer/html_handlebars/hbs_renderer.rs
+++ b/src/renderer/html_handlebars/hbs_renderer.rs
@@ -355,7 +355,8 @@ fn make_data(book: &Book,
     // Book data
 
     data.insert("language".to_owned(), "en".to_json());
-    data.insert("title".to_owned(), book.config.title.to_json());
+    data.insert("page-title".to_owned(), format!("{} - {}", chapter.title, book.config.title).to_json());
+    data.insert("chapter-title".to_owned(), chapter.title.to_json());
     data.insert("description".to_owned(), book.config.description.to_json());
 
     if let Some(ref x) = *livereload_script {
