diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go
index 1c06c227b5..ab04701001 100644
--- a/routers/web/repo/setting/setting.go
+++ b/routers/web/repo/setting/setting.go
@@ -940,7 +940,7 @@ func SettingsPost(ctx *context.Context) {
 		log.Trace("Repository was un-archived: %s/%s", ctx.Repo.Owner.Name, repo.Name)
 		ctx.Redirect(ctx.Repo.RepoLink + "/settings")
 
-	case "private", "public":
+	case "visibility":
 		if repo.IsFork {
 			ctx.Flash.Error(ctx.Tr("repo.settings.visibility.fork_error"))
 			ctx.Redirect(ctx.Repo.RepoLink + "/settings")
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index d180bb1371..0a56f2c13b 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -1036,7 +1036,7 @@
 			</div>
 			<form action="{{.Link}}" method="post">
 				{{.CsrfTokenHtml}}
-				<input type="hidden" name="action" value="{{if .Repository.IsPrivate}}public{{else}}private{{end}}">
+				<input type="hidden" name="action" value="visibility">
 				<input type="hidden" name="repo_id" value="{{.Repository.ID}}">
 				{{template "base/modal_actions_confirm" .}}
 			</form>