diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 4c6721eb24..c40265c6a6 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -89,7 +89,7 @@
 			{{if $allowedToChangeTeams}}
 				<form class="ui form" id="repo-collab-team-form" action="{{.Link}}/team" method="post">
 					{{.CsrfTokenHtml}}
-					<div id="search-team-box" class="ui search input gt-vm">
+					<div id="search-team-box" class="ui search input gt-vm" data-org-name="{{.OrgName}}">
 						<input class="prompt" name="team" placeholder="{{$.locale.Tr "repo.settings.search_team"}}" autocomplete="off" autofocus required>
 					</div>
 					<button class="ui green button">{{$.locale.Tr "repo.settings.add_team"}}</button>
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 0693840c31..8ec9908f73 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -2154,21 +2154,15 @@
   margin-top: 5px;
 }
 
-#search-repo-box .results .result img,
-#search-user-box .results .result img {
+#search-user-box .results .result .image {
   float: left;
   margin-right: 8px;
   width: 2em;
   height: 2em;
 }
 
-#search-repo-box .results .result .content,
 #search-user-box .results .result .content {
-  margin: 6px 0;
-}
-
-#search-team-box .results .result .content {
-  margin: 6px 0;
+  margin: 6px 0; /* this trick is used to align with the sibling avatar image */
 }
 
 .ui.menu .item > img:not(.ui) {
diff --git a/web_src/js/features/repo-settings.js b/web_src/js/features/repo-settings.js
index 8cc016fdc2..dc2240c7c5 100644
--- a/web_src/js/features/repo-settings.js
+++ b/web_src/js/features/repo-settings.js
@@ -47,7 +47,7 @@ export function initRepoSettingSearchTeamBox() {
   $searchTeamBox.search({
     minCharacters: 2,
     apiSettings: {
-      url: `${appSubUrl}/org/${$searchTeamBox.data('org')}/teams/-/search?q={query}`,
+      url: `${appSubUrl}/org/${$searchTeamBox.attr('data-org-name')}/teams/-/search?q={query}`,
       headers: {'X-Csrf-Token': csrfToken},
       onResponse(response) {
         const items = [];