diff --git a/lib/gollum/frontend/templates/editor.mustache b/lib/gollum/frontend/templates/editor.mustache
index 436a957b..ffb85119 100644
--- a/lib/gollum/frontend/templates/editor.mustache
+++ b/lib/gollum/frontend/templates/editor.mustache
@@ -1,15 +1,20 @@
 <div id="gollum-editor">
+{{#is_create_page}}
 <form name="gollum-editor" action="/create/{{escaped_name}}" method="post">
+{{/is_create_page}}
+{{#is_edit_page}}
+<form name="gollum-editor" action="/edit/{{escaped_name}}" method="post">
+{{/is_edit_page}}
   <fieldset id="gollum-editor-fields">
-  {{#show_title}}
+  {{#is_create_page}}
   <div id="gollum-editor-title-field" class="singleline">
     <label for="page" class="jaws">Page Title</label>
     <input type="text" name="page" id="gollum-editor-page-title" value="{{page_name}}">
   </div>
-  {{/show_title}}
-  {{#hidden_title}}
+  {{/is_create_page}}
+  {{#is_edit_page}}
   <input type="hidden" name="page" id="gollum-editor-page-title" value="{{page_name}}">
-  {{/hidden_title}}
+  {{/is_edit_page}}
   <div id="gollum-editor-function-bar">
     <a href="#" id="function-bold" class="function-button">
       <span>Bold</span></a>
diff --git a/lib/gollum/frontend/views/create.rb b/lib/gollum/frontend/views/create.rb
index a4cce0cf..073cc5af 100644
--- a/lib/gollum/frontend/views/create.rb
+++ b/lib/gollum/frontend/views/create.rb
@@ -9,11 +9,11 @@ module Precious
         "Create a new page"
       end
       
-      def show_title 
+      def is_create_page
         true
       end
       
-      def hidden_title
+      def is_edit_page
         false
       end
 
diff --git a/lib/gollum/frontend/views/edit.rb b/lib/gollum/frontend/views/edit.rb
index 15bc5727..bf789ed0 100644
--- a/lib/gollum/frontend/views/edit.rb
+++ b/lib/gollum/frontend/views/edit.rb
@@ -9,11 +9,11 @@ module Precious
         @name.gsub('-', ' ')
       end
 
-      def edit_title
+      def is_create_page
         false
       end
       
-      def hidden_title
+      def is_edit_page
         true
       end