2 files changed, 1 insertions, 2 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 4a16856ec..29f3ecc89 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -271,8 +271,6 @@ sub cgi_editpage ($$) { #{{{
 	my $q=shift;
 	my $session=shift;
 
-	loadindex();
-	
 	eval q{use CGI::FormBuilder};
 	my $form = CGI::FormBuilder->new(
 		fields => [qw(do rcsinfo from page content comments)],
diff --git a/ikiwiki b/ikiwiki
index bd905a426..7b0a718d9 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -472,6 +472,7 @@ sub main () { #{{{
 	}
 	elsif ($config{cgi}) {
 		lockwiki();
+		loadindex();
 		require IkiWiki::CGI;
 		cgi();
 	}