diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl
index 1d984a2e37..a0e1fc5005 100644
--- a/templates/explore/search.tmpl
+++ b/templates/explore/search.tmpl
@@ -13,11 +13,18 @@
 		</span>
 		{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 		<div class="menu">
-			<a class="{{if eq .SortType "newest"}}active {{end}}item" href="?sort=newest&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
-			<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="?sort=oldest&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
-			<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="?sort=alphabetically&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
-			<a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="?sort=reversealphabetically&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
+			<a class="{{if eq .SortType "newest"}}active {{end}}item" href="?sort=newest&q={{$.Keyword}}{{if .ShowGrouping}}&show_groups=1{{end}}">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
+			<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="?sort=oldest&q={{$.Keyword}}{{if .ShowGrouping}}&show_groups=1{{end}}">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
+			<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="?sort=alphabetically&q={{$.Keyword}}{{if .ShowGrouping}}&show_groups=1{{end}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
+			<a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="?sort=reversealphabetically&q={{$.Keyword}}{{if .ShowGrouping}}&show_groups=1{{end}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
 		</div>
 	</div>
+	{{if .PageIsExploreOrganizations}}
+	<!-- Show Groups Toggle -->
+	<label class="tw-flex tw-items-center tw-gap-2 tw-cursor-pointer tw-ml-2">
+		<input type="checkbox" id="show-grouping" {{if .ShowGrouping}}checked{{end}} onchange="window.location.href='?show_groups=' + (this.checked ? '1' : '0') + '&q={{.Keyword}}&sort={{.SortType}}'">
+		<span class="tw-whitespace-nowrap">{{ctx.Locale.Tr "explore.orgs.show_groups"}}</span>
+	</label>
+	{{end}}
 </div>
 <div class="divider"></div>
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index 1a550fe8de..f0d95e2177 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -3,14 +3,6 @@
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "explore/search" .}}
-		{{if .PageIsExploreOrganizations}}
-		<div class="tw-flex tw-items-center tw-justify-end tw-mb-4">
-			<label class="tw-flex tw-items-center tw-gap-2 tw-cursor-pointer">
-				<input type="checkbox" id="show-grouping" {{if .ShowGrouping}}checked{{end}} onchange="window.location.href='?show_groups=' + (this.checked ? '1' : '0') + '&q={{.Keyword}}&sort={{.SortType}}'">
-				<span>{{ctx.Locale.Tr "explore.orgs.show_groups"}}</span>
-			</label>
-		</div>
-		{{end}}
 		{{if and .PageIsExploreOrganizations .ShowGrouping .OrgHeaders}}
 		{{/* Grouped View for Organizations */}}
 		{{template "explore/org_list_grouped" .}}
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 90c71c5d14..fcb8bb6e99 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -193,14 +193,6 @@
 				{{/* Repositories Tab Content */}}
 				{{if .PageIsViewRepositories}}
 				{{template "shared/repo/search" .}}
-				{{/* Group Toggle */}}
-				<div class="tw-flex tw-items-center tw-justify-end tw-mb-4">
-					<label class="tw-flex tw-items-center tw-gap-2 tw-cursor-pointer">
-						<input type="checkbox" id="show-grouping" {{if .ShowGrouping}}checked{{end}} onchange="window.location.href='?show_groups=' + (this.checked ? '1' : '0') + '&q={{.Keyword}}&sort={{.SortType}}'">
-						<span>{{ctx.Locale.Tr "org.repos.show_groups"}}</span>
-					</label>
-				</div>
-
 				{{if and .ShowGrouping .RepoHeaders}}
 				{{/* Grouped View */}}
 				<div id="grouped-repos">
diff --git a/templates/shared/repo/search.tmpl b/templates/shared/repo/search.tmpl
index a852e65582..5a5d71d7e3 100644
--- a/templates/shared/repo/search.tmpl
+++ b/templates/shared/repo/search.tmpl
@@ -53,6 +53,13 @@
 			</div>
 		</div>
 	</form>
+	{{if .PageIsViewRepositories}}
+	<!-- Show Groups Toggle -->
+	<label class="tw-flex tw-items-center tw-gap-2 tw-cursor-pointer tw-ml-2">
+		<input type="checkbox" id="show-grouping" {{if .ShowGrouping}}checked{{end}} onchange="window.location.href='?show_groups=' + (this.checked ? '1' : '0') + '&q={{.Keyword}}&sort={{.SortType}}'">
+		<span class="tw-whitespace-nowrap">{{ctx.Locale.Tr "org.repos.show_groups"}}</span>
+	</label>
+	{{end}}
 </div>
 {{if and .PageIsExploreRepositories .OnlyShowRelevant}}
 	<div class="ui message">