=== modified file 'IkiWiki/CGI.pm'
--- IkiWiki/CGI.pm	
+++ IkiWiki/CGI.pm	
@@ -427,7 +427,11 @@
 	}
 	
 	if ($form->submitted eq "Cancel") {
-		redirect($q, "$config{url}/".htmlpage($page));
+		if ( $newpage && defined $from ) {
+			redirect($q, "$config{url}/".htmlpage($from));
+		} else {
+			redirect($q, "$config{url}/".htmlpage($page));
+		}
 		return;
 	}
 	elsif ($form->submitted eq "Preview") {