diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 10f240af9..afe8d3afd 100644
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -83,7 +83,10 @@ class ArtistsController < ApplicationController
 
   def show_or_new
     @artist = Artist.find_by_name(params[:name])
-    if @artist
+
+    if params[:name].blank?
+      redirect_to new_artist_path(artist_params(:new))
+    elsif @artist.present?
       redirect_to artist_path(@artist)
     else
       @artist = Artist.new(name: params[:name])
diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb
index a06091ff7..142c8deef 100644
--- a/app/controllers/wiki_pages_controller.rb
+++ b/app/controllers/wiki_pages_controller.rb
@@ -82,7 +82,10 @@ class WikiPagesController < ApplicationController
 
   def show_or_new
     @wiki_page = WikiPage.find_by_title(params[:title])
-    if @wiki_page
+
+    if params[:title].blank?
+      redirect_to new_wiki_page_path(wiki_page_params(:create))
+    elsif @wiki_page.present?
       redirect_to wiki_page_path(@wiki_page)
     else
       @wiki_page = WikiPage.new(:title => params[:title])