diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index c23c41a..1cf72ad 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -26,19 +26,25 @@
     val owner      = params("owner")
     val repository = params("repository")
     
-    wiki.html.wiki("Home", 
-        WikiUtil.getPage(owner, repository, "Home"), 
+    WikiUtil.getPage(owner, repository, "Home") match {
+      case Some(page) => wiki.html.wiki("Home", page, 
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+      case None => wiki.html.wikiedit("Home", None, 
+        JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+    }
   }
   
   get("/:owner/:repository/wiki/:page"){
     val owner      = params("owner")
     val repository = params("repository")
-    val page       = params("page")
+    val pageName   = params("page")
     
-    wiki.html.wiki(page, 
-        WikiUtil.getPage(owner, repository, page), 
+    WikiUtil.getPage(owner, repository, pageName) match {
+      case Some(page) => wiki.html.wiki(pageName, page, 
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+      case None => wiki.html.wikiedit(pageName, None, 
+        JGitUtil.getRepositoryInfo(owner, repository, servletContext))
+    }
   }
   
   get("/:owner/:repository/wiki/:page/_history"){
diff --git a/src/main/twirl/wiki/wiki.scala.html b/src/main/twirl/wiki/wiki.scala.html
index 2fff768..f5c0f5e 100644
--- a/src/main/twirl/wiki/wiki.scala.html
+++ b/src/main/twirl/wiki/wiki.scala.html
@@ -1,27 +1,25 @@
-@(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context)
+@(pageName: String, page: util.WikiUtil.WikiPageInfo, repository: app.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
 @html.main(pageName + " - " + repository.owner + "/" + repository.name){
   @html.header("wiki", repository)
   @wikitab((if(pageName == "Home") "home" else ""), repository)
-  @page.map { page =>
-    <ul class="nav nav-tabs">
-      <li>
-        <h1 class="wiki-title">@pageName</h1>
-      </li>
-      <li class="pull-right">
-        <div class="btn-group">
+  <ul class="nav nav-tabs">
+    <li>
+      <h1 class="wiki-title">@pageName</h1>
+    </li>
+    <li class="pull-right">
+      <div class="btn-group">
         <a class="btn" href="@path/@repository.owner/@repository.name/wiki/_new">New Page</a>
         <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName/_edit">Edit Page</a>
         <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName/_history">Page History</a>
-        </div>
-      </li>
-    </ul>
-    <div class="markdown-body">
-      @helpers.markdown(page.content, repository)
-    </div>
-    <div class="small">
-      <span class="description">Last edited by @page.committer at @helpers.datetime(page.time)</span>
-    </div>
-  }
+      </div>
+    </li>
+  </ul>
+  <div class="markdown-body">
+    @helpers.markdown(page.content, repository)
+  </div>
+  <div class="small">
+    <span class="description">Last edited by @page.committer at @helpers.datetime(page.time)</span>
+  </div>
 }
\ No newline at end of file