diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index c1e6fa6e..ad8f2634 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 c17dd482..c5b9bb86 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 %>