diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 829629f44..cd04e05af 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -117,10 +117,21 @@ function initEditor(cb){
 		$("#jot-title").mouseout(function() {
 			$("#jot-title").hide();
 			var ttl = $("#jot-title").val();
-			$("#jot-title-desc").html((ttl.length) ? "<strong>" + ttl + "</strong>" : addtitle );
-			$("#jot-title-desc").show();
+			$('#jot-title-display').html(ttl);
+			if(ttl.length) {
+				$("#jot-title-display").show();
+			}
+			else {
+				$("#jot-title-desc").show();
+			}
 		});
 
+		$("#jot-title-display").click(function() {
+			$("#jot-title-display").hide();
+			$("#jot-title").show();
+			$("#jot-title").focus();
+		});		
+
 		$("#jot-title-desc").click(function() {
 			$("#jot-title-desc").hide();
 			$("#jot-title").show();
diff --git a/view/jot.tpl b/view/jot.tpl
index cb4eb64d4..66621db5e 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -15,6 +15,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<div id="jot-title-wrapper">
 		<span id="jot-title-desc" style="display: none;">$addtitle</span>
+		<span id="jot-title-display" style="display: none;"></span>
 		<input type="text" name="title" id="jot-title" value="" style="display: none;" />
 		</div>
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index f3c0e7a90..6ce4c52c0 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -276,6 +276,9 @@ div.wall-item-content-wrapper.shiny {
 #jot-title-wrapper {
 	margin-bottom: 5px;
 }
+#jot-title-display {
+	font-weight: bold;
+}
 
 #jot-title {
 	border: 1px solid #cccccc;