diff --git a/src/MiniDocs/Markdown.class.st b/src/MiniDocs/Markdown.class.st
index 33739c8..5bbfd1e 100644
--- a/src/MiniDocs/Markdown.class.st
+++ b/src/MiniDocs/Markdown.class.st
@@ -165,7 +165,7 @@ Markdown >> gtTextFor: aView [
 Markdown >> headerAsTitle [
 	| headerNode |
 	headerNode := self documentTree children 
-		detect: [ :node | node className = 'PPCMHeader' and: [ node level = 1 ] ] ifNone: [ ^ nil ].
+		detect: [ :node | node className = 'PPCMHeader' and: [ node level = 1 ] ] ifNone: [ ^ 'Untitled' ].
 	^ headerNode text
 ]
 
@@ -215,5 +215,5 @@ Markdown >> printOn: aStream [
 
 { #category : #accessing }
 Markdown >> title [
-	^ self metadata at: 'title' ifAbsentPut: [ self headerAsTitle ]
+	^ title ifNil: [ title:= self headerAsTitle ]
 ]