diff --git a/ikiwiki b/ikiwiki
index 38dae8f24..2130c4f78 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -1131,8 +1131,15 @@ sub cgi_editpage ($$) { #{{{
 			else {
 				my $dir=$from."/";
 				$dir=~s![^/]+/$!!;
+				
+				if ($page eq 'discussion') {
+					$best_loc="$from/$page";
+				}
+				else {
+					$best_loc=$dir.$page;
+				}
+				
 				push @page_locs, $dir.$page;
-				$best_loc=$dir.$page;
 				push @page_locs, "$from/$page";
 				while (length $dir) {
 					$dir=~s![^/]+/$!!;