diff --git a/src/main/scala/app/WikiController.scala b/src/main/scala/app/WikiController.scala
index b56dba8..4232421 100644
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -11,7 +11,7 @@
     "pageName"        -> trim(label("Page name"          , text(required, maxlength(40)))), 
     "content"         -> trim(label("Content"            , text(required))),
     "message"         -> trim(label("Message"            , optional(text()))),
-    "currentPageName" -> trim(label("Current page name"  , text(required)))
+    "currentPageName" -> trim(label("Current page name"  , text()))
   )(WikiPageEditForm.apply)
   
   get("/:owner/:repository/wiki"){
@@ -43,14 +43,21 @@
         JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
   
-  post("/:owner/:repository/wiki/:page/_edit", form){ form =>
+  post("/:owner/:repository/wiki/_save", form){ form =>
     val owner      = params("owner")
     val repository = params("repository")
-    val page       = params("page")
     
     WikiUtil.savePage(owner, repository, form.currentPageName, form.pageName, 
         form.content, LoginUser, form.message.getOrElse(""))
     
-    redirect("%s/%s/wiki/%s".format(owner, repository, page))
+    redirect("%s/%s/wiki/%s".format(owner, repository, form.pageName))
+  }
+  
+  get("/:owner/:repository/wiki/_new"){
+    val owner      = params("owner")
+    val repository = params("repository")
+    
+    html.wikiedit("", None, 
+        JGitUtil.getRepositoryInfo(owner, repository, servletContext))
   }
 }
\ No newline at end of file
diff --git a/src/main/scala/util/WikiUtil.scala b/src/main/scala/util/WikiUtil.scala
index cb99e2a..ee12d2d 100644
--- a/src/main/scala/util/WikiUtil.scala
+++ b/src/main/scala/util/WikiUtil.scala
@@ -98,7 +98,7 @@
     cloned.add.addFilepattern(file.getName).call
     
     // delete file
-    if(currentPageName != newPageName){
+    if(currentPageName != "" && currentPageName != newPageName){
       cloned.rm.addFilepattern(currentPageName + ".md")
     }
     
diff --git a/src/main/twirl/wiki.scala.html b/src/main/twirl/wiki.scala.html
index 089e148..7eede6a 100644
--- a/src/main/twirl/wiki.scala.html
+++ b/src/main/twirl/wiki.scala.html
@@ -16,7 +16,7 @@
       </li>
       <li class="pull-right">
         <div class="btn-group">
-        <a class="btn" href="#">New Page</a>
+        <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="#">Page History</a>
         </div>
diff --git a/src/main/twirl/wikiedit.scala.html b/src/main/twirl/wikiedit.scala.html
index 90ac4bd..6610c9e 100644
--- a/src/main/twirl/wikiedit.scala.html
+++ b/src/main/twirl/wikiedit.scala.html
@@ -1,7 +1,7 @@
 @(pageName: String, page: Option[util.WikiUtil.WikiPageInfo], repository: app.RepositoryInfo)(implicit context: app.Context)
 @import view.helpers
 @import context._
-@main(pageName + " - " + repository.owner + "/" + repository.name){
+@main((if(pageName == "") "New Page" else pageName) + " - " + repository.owner + "/" + repository.name){
   @header("wiki", repository)
   <ul class="nav nav-tabs">
     <li><a href="">Home</a></li>
@@ -9,28 +9,28 @@
     <li><a href="">Wiki History</a></li>
     <li><a href="">Git Access</a></li>
   </ul>
-  @page.map { page =>
-    <ul class="nav nav-tabs">
-      <li>
-        <h1 class="wiki-title"><span class="description">Editing</span> @pageName</h1>
-      </li>
-      <li class="pull-right">
-        <div class="btn-group">
+  <ul class="nav nav-tabs">
+    <li>
+      <h1 class="wiki-title"><span class="description">Editing</span> @if(pageName == ""){New Page} else {@pageName}</h1>
+    </li>
+    <li class="pull-right">
+      <div class="btn-group">
+      @if(pageName != ""){
         <a class="btn" href="@path/@repository.owner/@repository.name/wiki/@pageName">View Page</a>
         <a class="btn" href="#">Delete Page</a>
         <a class="btn" href="#">Page History</a>
-        </div>
-      </li>
-    </ul>
-    <form action="_edit" method="POST" validate="true">
-      <span id="error-pageName" class="error-message"></span>
-      <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;"/>
-      <span id="error-content" class="error-message"></span>
-      <textarea name="content" style="width: 900px; height: 400px;">@page.content</textarea>
-      <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
-      <input type="hidden" name="currentPageName" value="@pageName"/>
-      <input type="submit" value="Save" class="btn btn-primary">
-      <input type="button" value="Preview" class="btn">
-    </form>
-  }
+      }
+      </div>
+    </li>
+  </ul>
+  <form action="@path/@repository.owner/@repository.name/wiki/_save" method="POST" validate="true">
+    <span id="error-pageName" class="error-message"></span>
+    <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
+    <span id="error-content" class="error-message"></span>
+    <textarea name="content" style="width: 900px; height: 400px;">@page.map(_.content)</textarea>
+    <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
+    <input type="hidden" name="currentPageName" value="@pageName"/>
+    <input type="submit" value="Save" class="btn btn-primary">
+    <input type="button" value="Preview" class="btn">
+  </form>
 }
\ No newline at end of file