diff --git a/public/css/gogs.css b/public/css/gogs.css
index 4e5c21e7c..e437ae49a 100644
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -2762,7 +2762,7 @@ footer .ui.language .menu {
 .user.settings .email.list .item:not(:first-child) .button {
   margin-top: -10px;
 }
-.user.settings .orgs {
+.user.settings .orgs.non-empty {
   padding: 0;
 }
 .user.settings .orgs .item {
diff --git a/public/less/_user.less b/public/less/_user.less
index 2bcbf4f82..a404c0448 100644
--- a/public/less/_user.less
+++ b/public/less/_user.less
@@ -20,7 +20,9 @@
 			}
 		}
 		.orgs {
-			padding: 0;
+			&.non-empty {
+				padding: 0;
+			}
 			.item {
 				padding: 10px;
 				.button {
diff --git a/templates/user/settings/organizations.tmpl b/templates/user/settings/organizations.tmpl
index fc9067221..b4963264b 100644
--- a/templates/user/settings/organizations.tmpl
+++ b/templates/user/settings/organizations.tmpl
@@ -11,7 +11,7 @@
 						<a class="ui blue tiny button" href="{{AppSubUrl}}/org/create">{{.i18n.Tr "new_org"}}</a>
 					</div>
 				</h4>
-				<div class="ui attached segment orgs">
+				<div class="ui attached segment orgs {{if .Orgs}}non-empty{{end}}">
 					{{if .Orgs}}
 						<div class="ui middle aligned divided list">
 							{{range .Orgs}}