diff --git a/routers/web/org/members.go b/routers/web/org/members.go
index 92fbed01a2..ff7358d02f 100644
--- a/routers/web/org/members.go
+++ b/routers/web/org/members.go
@@ -83,6 +83,8 @@ func MembersAction(ctx *context.Context) {
 		return
 	}
 
+	redirectURL := ctx.FormString("redirect")
+
 	org := ctx.Org.Organization
 	var err error
 	switch ctx.Params(":action") {
@@ -134,7 +136,11 @@ func MembersAction(ctx *context.Context) {
 		return
 	}
 
-	log.Info("redirecting to", ctx.Org.OrgLink)
+	if redirectURL != "" {
+        ctx.JSONRedirect(redirectURL)
+		return
+    }
+
 	redirect := ctx.Org.OrgLink + "/members"
 	if ctx.Params(":action") == "leave" {
 		redirect = setting.AppSubURL + "/"
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 335e91e5e1..97b143579e 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -25,9 +25,9 @@
 						<div class="flex-item-trailing">
 							{{$isPublic := index $.OrgsIsPublicMember .ID}}
 							{{if $isPublic}}
-								<a class="ui tiny button link-action" href data-url="{{.OrganisationLink}}/members/action/private?uid={{$.SignedUser.ID}}">{{svg "octicon-eye-closed" 12 "icon"}}{{ctx.Locale.Tr "org.members.public_helper"}}</a>
+								<a class="ui tiny button link-action" href data-url="{{.OrganisationLink}}/members/action/private?uid={{$.SignedUser.ID}}&redirect=/user/settings/organization">{{svg "octicon-eye-closed" 12 "icon"}}{{ctx.Locale.Tr "org.members.public_helper"}}</a>
 							{{else}}
-								<a class="ui tiny button link-action" href data-url="{{.OrganisationLink}}/members/action/public?uid={{$.SignedUser.ID}}">{{svg "octicon-eye" 12 "icon"}}{{ctx.Locale.Tr "org.members.private_helper"}}</a>
+								<a class="ui tiny button link-action" href data-url="{{.OrganisationLink}}/members/action/public?uid={{$.SignedUser.ID}}&redirect=/user/settings/organization">{{svg "octicon-eye" 12 "icon"}}{{ctx.Locale.Tr "org.members.private_helper"}}</a>
 							{{end}}
 							<form>
 								{{$.CsrfTokenHtml}}