diff --git a/src/main/scala/gitbucket/core/controller/FileUploadController.scala b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
index 3296903..9ca7e6b 100644
--- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala
+++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
@@ -1,6 +1,7 @@
 package gitbucket.core.controller
 
 import gitbucket.core.model.Account
+import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.servlet.Database
 import gitbucket.core.util._
@@ -9,10 +10,10 @@
 import gitbucket.core.util.Implicits._
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.dircache.DirCache
-import org.eclipse.jgit.lib.{FileMode, Constants}
+import org.eclipse.jgit.lib.{Constants, FileMode}
 import org.scalatra._
-import org.scalatra.servlet.{MultipartConfig, FileUploadSupport, FileItem}
-import org.apache.commons.io.{IOUtils, FileUtils}
+import org.scalatra.servlet.{FileItem, FileUploadSupport, MultipartConfig}
+import org.apache.commons.io.{FileUtils, IOUtils}
 
 /**
  * Provides Ajax based file upload functionality.
@@ -45,7 +46,7 @@
       val repository = params("repository")
 
       // Check whether logged-in user is collaborator
-      collaboratorsOnly(owner, repository, loginAccount){
+      onlyWikiEditable(owner, repository, loginAccount){
         execute({ (file, fileId) =>
           val fileName = file.getName
           LockUtil.lock(s"${owner}/${repository}/wiki") {
@@ -87,12 +88,16 @@
     redirect("/admin/data")
   }
 
-  private def collaboratorsOnly(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
+  private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
     implicit val session = Database.getSession(request)
-    loginAccount match {
-      case x if(x.isAdmin) => action
-      case x if(getCollaborators(owner, repository).contains(x.userName)) => action
-      case _ => BadRequest()
+    getRepository(owner, repository) match {
+      case Some(x) => x.repository.options.wikiOption match {
+        case "ALL"     if !x.repository.isPrivate => action
+        case "PUBLIC"  if hasGuestRole(owner, repository, Some(loginAccount)) => action
+        case "PRIVATE" if hasDeveloperRole(owner, repository, Some(loginAccount)) => action
+        case _  => BadRequest()
+      }
+      case None => BadRequest()
     }
   }
 
diff --git a/src/main/twirl/gitbucket/core/settings/options.scala.html b/src/main/twirl/gitbucket/core/settings/options.scala.html
index b2df7b8..7589425 100644
--- a/src/main/twirl/gitbucket/core/settings/options.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/options.scala.html
@@ -102,7 +102,7 @@
               </div>
               <div class="radio for-public-repo">
                 <label>
-                  <input type="radio" name="wikiOption" value="ALL" @if(repository.repository.options.issuesOption == "ALL"){ checked}> All users can view, create and edit wiki pages
+                  <input type="radio" name="wikiOption" value="ALL" @if(repository.repository.options.wikiOption == "ALL"){ checked}> All users can view, create and edit wiki pages
                 </label>
               </div>
               <label for="externalWikiUrl" class="strong">External URL: