diff --git a/app/contexts/projects/create_context.rb b/app/contexts/projects/create_context.rb
index 1c60a5de141afa8e344b516b57cf0ca8967ab67d..fe6da7f5ded957cfc4a71fe544442bfcd3b9e7bb 100644
--- a/app/contexts/projects/create_context.rb
+++ b/app/contexts/projects/create_context.rb
@@ -46,6 +46,15 @@ module Projects
 
       @project.creator = current_user
 
+      if @project.valid? && @project.wiki_enabled?
+        begin
+          #force the creation of a wiki,
+          GollumWiki.new(@project, current_user).wiki
+        rescue => exception
+          @project.errors.add(:wiki_enabled, 'cannot create wiki')
+        end
+      end
+
       if @project.save
         @project.discover_default_branch