1 files changed, 7 insertions, 7 deletions

diff --git a/ikiwiki b/ikiwiki
index 77c7744f9..ea5604365 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -466,7 +466,13 @@ sub globlist_match ($$) { #{{{
 sub main () { #{{{
 	getconfig();
 	
-	if ($config{setup}) {
+	if ($config{cgi}) {
+		lockwiki();
+		loadindex();
+		require IkiWiki::CGI;
+		cgi();
+	}
+	elsif ($config{setup}) {
 		require IkiWiki::Setup;
 		setup();
 	}
@@ -475,12 +481,6 @@ sub main () { #{{{
 		require IkiWiki::Wrapper;
 		gen_wrapper();
 	}
-	elsif ($config{cgi}) {
-		lockwiki();
-		loadindex();
-		require IkiWiki::CGI;
-		cgi();
-	}
 	else {
 		lockwiki();
 		loadindex();