Index: app/views/wiki/edit.html.erb
===================================================================
--- app/views/wiki/edit.html.erb	(revision 14637)
+++ app/views/wiki/edit.html.erb	(working copy)
@@ -33,8 +33,13 @@
 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 </div>
 
-<p><%= submit_tag l(:button_save) %>
-   <%= preview_link({:controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title }, 'wiki_form') %></p>
+<p>
+  <%= submit_tag l(:button_save) %>
+   <%= preview_link({:controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title }, 'wiki_form') %>
+   <% unless @page.new_record? && @page.parent.nil? %>
+     | <%= link_to l(:button_cancel), @page.new_record? ? @page.parent : @page %>
+  <% end %>
+ </p>
 <%= wikitoolbar_for 'content_text' %>
 <% end %>