diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index c1e6fa6e7e3d839fd77cc080f4a76a4c5763b156..ad8f26346c0d630823246ff3b3651ff49000c699 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -82,7 +82,6 @@ class WikiController < ApplicationController
       end
     end
     @editable = editable?
-    render :action => 'show'
   end
   
   # edit an existing page or a new one
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index c17dd482405dc869b7867f9ad03d61f3a6af059c..c5b9bb86eae61b4bb7d5b36385dba445c67273c3 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -57,7 +57,7 @@
 <% end %>
 
 <% content_for :sidebar do %>
-  <%= render :partial => 'sidebar' %>
+  <%= render :partial => 'wiki/sidebar' %>
 <% end %>
 
 <% html_title @page.pretty_title %>