diff --git a/services/context/repo.go b/services/context/repo.go
index 9909e7488e..38f2734291 100644
--- a/services/context/repo.go
+++ b/services/context/repo.go
@@ -16,11 +16,10 @@ import (
 	"strconv"
 	"strings"
 
-	group_model "code.gitea.io/gitea/models/group"
-
 	asymkey_model "code.gitea.io/gitea/models/asymkey"
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
+	group_model "code.gitea.io/gitea/models/group"
 	issues_model "code.gitea.io/gitea/models/issues"
 	access_model "code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go
index cedc0406ca..cbda19ded8 100644
--- a/tests/integration/org_test.go
+++ b/tests/integration/org_test.go
@@ -37,25 +37,33 @@ func TestOrg(t *testing.T) {
 func testOrgRepos(t *testing.T) {
 	var (
 		users = []string{"user1", "user2"}
-		cases = map[string][]string{
-			"alphabetically":        {"repo21", "repo3", "repo5"},
-			"reversealphabetically": {"repo5", "repo3", "repo21"},
+		cases = map[string]map[string][]string{
+			"129": {
+				"alphabetically":        {"repo21", "repo3"},
+				"reversealphabetically": {"repo3", "repo21"},
+			},
+			"139": {
+				"alphabetically":        {"repo5"},
+				"reversealphabetically": {"repo5"},
+			},
 		}
 	)
 
 	for _, user := range users {
 		t.Run(user, func(t *testing.T) {
 			session := loginUser(t, user)
-			for sortBy, repos := range cases {
-				req := NewRequest(t, "GET", "/org3?sort="+sortBy)
-				resp := session.MakeRequest(t, req, http.StatusOK)
+			for group, groupCases := range cases {
+				for sortBy, repos := range groupCases {
+					req := NewRequest(t, "GET", "/org3/groups/"+group+"?sort="+sortBy)
+					resp := session.MakeRequest(t, req, http.StatusOK)
 
-				htmlDoc := NewHTMLParser(t, resp.Body)
+					htmlDoc := NewHTMLParser(t, resp.Body)
 
-				sel := htmlDoc.doc.Find("a.name")
-				assert.Len(t, repos, len(sel.Nodes))
-				for i := range repos {
-					assert.Equal(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
+					sel := htmlDoc.doc.Find("a.name")
+					assert.Len(t, repos, len(sel.Nodes))
+					for i := range repos {
+						assert.Equal(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
+					}
 				}
 			}
 		})
diff --git a/web_src/js/components/DashboardRepoGroup.vue b/web_src/js/components/DashboardRepoGroup.vue
index 4064b21928..4a630a13e5 100644
--- a/web_src/js/components/DashboardRepoGroup.vue
+++ b/web_src/js/components/DashboardRepoGroup.vue
@@ -103,7 +103,6 @@ const options: SortableOptions = {
     get() {
       return combined.value.map((a) => getId(a)).filter((a, i, arr) => arr.indexOf(a) === i);
     },
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     async set(sortable) {
       const arr = sortable.toArray();
       const groups = Array.from(new Set(arr.filter((a) => a.startsWith('group')).map((a) => parseInt(a.split('-')[1]))));
@@ -180,7 +179,7 @@ const options: SortableOptions = {
     :class="{ 'expandable-menu': curGroup === 0, 'repo-owner-name-list': curGroup === 0, 'expandable-ul': true }"
     v-model:list="combined"
     :data-is-group="true"
-    :item-key="(it) => getId(it)"
+    :item-key="(it: any) => getId(it)"
     :key="dynKey"
   >
     <template #item="{ element, index }">