diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb
index 5645bba2e..58f4c17a3 100644
--- a/app/controllers/wiki_pages_controller.rb
+++ b/app/controllers/wiki_pages_controller.rb
@@ -69,6 +69,9 @@ class WikiPagesController < ApplicationController
     @wiki_page = WikiPage.find_by_title(params[:title])
     if @wiki_page
       redirect_to wiki_page_path(@wiki_page)
+    else
+      @wiki_page = WikiPage.new(params[:wiki_page])
+      respond_with(@wiki_page)
     end
   end
 
diff --git a/app/helpers/wiki_pages_helper.rb b/app/helpers/wiki_pages_helper.rb
index 9fbc3862c..382b6ae9b 100644
--- a/app/helpers/wiki_pages_helper.rb
+++ b/app/helpers/wiki_pages_helper.rb
@@ -33,4 +33,17 @@ module WikiPagesHelper
 
     html.html_safe
   end
+
+  def wiki_page_post_previews(wiki_page)
+    html = '<div id="wiki-page-posts">'
+
+    if Post.fast_count(wiki_page.title) > 0
+      html << "<h2>Posts</h2>"
+      html << wiki_page.post_set.presenter.post_previews_html(self)
+    end
+    
+    html << "</div>"
+
+    html.html_safe
+  end
 end
diff --git a/app/views/wiki_pages/new.html.erb b/app/views/wiki_pages/new.html.erb
index 0d56f5858..3482cea4d 100644
--- a/app/views/wiki_pages/new.html.erb
+++ b/app/views/wiki_pages/new.html.erb
@@ -15,12 +15,7 @@
 
       <%= wiki_page_alias_and_implication_list(@wiki_page)%>
 
-      <div id="wiki-page-posts">
-        <% if Post.fast_count(@wiki_page.title) > 0 %>
-          <h2>Posts</h2>
-        <% end %>
-        <%= @wiki_page.post_set.presenter.post_previews_html(self) %>
-      </div>
+      <%= wiki_page_post_previews(@wiki_page) %>
 
       <div class="clearfix"></div>
 
diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb
index 74b051b81..4b4f37bb4 100644
--- a/app/views/wiki_pages/show.html.erb
+++ b/app/views/wiki_pages/show.html.erb
@@ -18,12 +18,7 @@
         <%= wiki_page_alias_and_implication_list(@wiki_page) %>
       </div>
 
-      <div id="wiki-page-posts">
-        <% if Post.fast_count(@wiki_page.title) > 0 %>
-          <h2>Posts</h2>
-        <% end %>
-        <%= @wiki_page.post_set.presenter.post_previews_html(self) %>
-      </div>
+      <%= wiki_page_post_previews(@wiki_page) %>
     </section>
   </div>
 </div>
diff --git a/app/views/wiki_pages/show_or_new.html.erb b/app/views/wiki_pages/show_or_new.html.erb
index 8c7288781..c75c45a95 100644
--- a/app/views/wiki_pages/show_or_new.html.erb
+++ b/app/views/wiki_pages/show_or_new.html.erb
@@ -7,12 +7,17 @@
       <div id="wiki-page-body" class="prose">
         <p>This wiki page does not exist. <%= link_to "Create new wiki page", new_wiki_page_path(:wiki_page => {:title => params[:title]}) %>.</p>
       </div>
+
+      <%= wiki_page_alias_and_implication_list(@wiki_page)%>
+
+      <%= wiki_page_post_previews(@wiki_page) %>
+
     </section>
   </div>
 </div>
 
+<%= render "secondary_links" %>
+
 <% content_for(:page_title) do %>
   Wiki - <%= params[:title] %> - <%= Danbooru.config.app_name %>
 <% end %>
-
-<%= render "secondary_links" %>