diff --git a/simplewiki_base.html b/simplewiki_base.html
index a4f792b825..cc33a52d42 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -84,7 +84,7 @@
         if (wiki_article is not UNDEFINED):
         	baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
         else:
-        	baseURL = reverse("wiki_view", args=[""])
+        	baseURL = reverse("wiki_view", args=["/"])
     %>
 
       <ul class="action">
@@ -113,14 +113,14 @@
 
           <div id="wiki_create_form">
             <%
-              theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')+'/_create/'"
+              theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')"
               if (wiki_article is not UNDEFINED):
-                baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
+                baseURL = reverse("wiki_create", args=[wiki_article.get_url()])
               else:
-                baseURL = reverse("wiki_view", args=[""])
+                baseURL = reverse("wiki_create", args=["/"])
             %>
 
-            <form method="GET" onsubmit="this.action='${baseURL + "/' + " + theaction};">
+            <form method="GET" onsubmit="this.action='${baseURL + "' + " + theaction};">
 
               <div>
                 <label for="id_wiki_article_name">Title of article</label>
diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html
index a96a7a1a97..13513639c3 100644
--- a/simplewiki_searchresults.html
+++ b/simplewiki_searchresults.html
@@ -16,11 +16,7 @@
 
 <%block name="wiki_body">
 	%for article in wiki_search_results:
-		%if article is not UNDEFINED:
-			<a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()}</a><br/>
-		%else:
-			<a href="${reverse("wiki_view", args=[''])}">/</a><br/>
-		%endif
+		<a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()}</a><br/>
 	%endfor
 	
 	%if not wiki_search_results: