diff --git a/public/js/title.js b/public/js/title.js
index 4febf2c..56ffb29 100644
--- a/public/js/title.js
+++ b/public/js/title.js
@@ -15,10 +15,14 @@ function showModal(encodedPath, pages, percentage, encodedeTitle, encodedEntryTi
 	if (percentage === 100) {
 		$('#read-btn').attr('hidden', '');
 	}
-	$('#modal-title').find('span').text(entry);
-	$('#modal-title').next().attr('data-id', titleID);
-	$('#modal-title').next().attr('data-entry-id', entryID);
-	$('#modal-title').next().find('.title-rename-field').val(entry);
+
+	$('#modal-title-link').text(title);
+	$('#modal-title-link').attr('href', '/book/' + titleID);
+
+	$('#modal-entry-title').find('span').text(entry);
+	$('#modal-entry-title').next().attr('data-id', titleID);
+	$('#modal-entry-title').next().attr('data-entry-id', entryID);
+	$('#modal-entry-title').next().find('.title-rename-field').val(entry);
 	$('#path-text').text(zipPath);
 	$('#pages-text').text(pages + ' pages');
 
diff --git a/src/views/home.ecr b/src/views/home.ecr
index 1e52d5b..77d37cb 100644
--- a/src/views/home.ecr
+++ b/src/views/home.ecr
@@ -27,7 +27,8 @@
     <button class="uk-modal-close-default" type="button" uk-close></button>
     <div class="uk-modal-header">
 	<div>
-		<h3 class="uk-modal-title break-word" id="modal-title"><span></span>
+    <h4 class="uk-margin-remove-bottom"><a id="modal-title-link"></a></h4>
+		<h3 class="uk-modal-title break-word uk-margin-remove-top" id="modal-entry-title"><span></span>
 			&nbsp;
 			<% if is_admin %>
 				<a class="uk-icon-button" uk-icon="icon:pencil"></a>
diff --git a/src/views/title.ecr b/src/views/title.ecr
index c6ade3a..36246af 100644
--- a/src/views/title.ecr
+++ b/src/views/title.ecr
@@ -75,7 +75,7 @@
     <button class="uk-modal-close-default" type="button" uk-close></button>
     <div class="uk-modal-header">
 	<div>
-		<h3 class="uk-modal-title break-word" id="modal-title"><span></span>
+		<h3 class="uk-modal-title break-word" id="modal-entry-title"><span></span>
 			&nbsp;
 			<% if is_admin %>
 				<a class="uk-icon-button" uk-icon="icon:pencil"></a>
@@ -105,7 +105,7 @@
     <button class="uk-modal-close-default" type="button" uk-close></button>
     <div class="uk-modal-header">
 	<div>
-		<h3 class="uk-modal-title break-word" id="modal-title">Edit</h3>
+		<h3 class="uk-modal-title break-word" id="modal-entry-title">Edit</h3>
 	</div>
     </div>
     <div class="uk-modal-body">