diff --git a/basewiki/index.mdwn b/basewiki/index.mdwn
index ea78c23c9..d598c1f89 100644
--- a/basewiki/index.mdwn
+++ b/basewiki/index.mdwn
@@ -2,4 +2,6 @@ Welcome to your new wiki.
 
 All wikis are supposed to have a [[SandBox]], so this one does too.
 
+----
+
 This wiki is powered by [ikiwiki](http://ikiwiki.kitenet.net).
diff --git a/ikiwiki b/ikiwiki
index 4d022284e..38dae8f24 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -1132,8 +1132,8 @@ sub cgi_editpage ($$) { #{{{
 				my $dir=$from."/";
 				$dir=~s![^/]+/$!!;
 				push @page_locs, $dir.$page;
+				$best_loc=$dir.$page;
 				push @page_locs, "$from/$page";
-				$best_loc="$from/$page";
 				while (length $dir) {
 					$dir=~s![^/]+/$!!;
 					push @page_locs, $dir.$page;