diff --git a/src/components/runners/RunnerDetail.svelte b/src/components/runners/RunnerDetail.svelte
index 16949055..da9f85e4 100644
--- a/src/components/runners/RunnerDetail.svelte
+++ b/src/components/runners/RunnerDetail.svelte
@@ -52,12 +52,17 @@
 					return { label: r.name, value: r };
 				});
 				groups = groups.concat(orgs);
+				groups.sort((a, b) => a.label.localeCompare(b.label));
 				RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
 					const teams = val.map((r) => {
 						return { label: `${r.parentGroup.name} > ${r.name}`, value: r };
 					});
 					groups = groups.concat(teams);
-					group = groups.find((g) => g.value.id == editable.group);
+					groups.sort((a, b) => a.label.localeCompare(b.label));
+					let tmp_group = groups.find((g) => g.value.id == editable.group);
+					if (tmp_group) {
+						group = tmp_group.value.id;
+					}
 				});
 			}
 		);
@@ -270,21 +275,14 @@
 		</div>
 		<div class="text-sm w-full mt-2">
 			<span class="font-semibold text-gray-700">{$_("group")}</span>
-			<Select
-				containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				itemFilter={(label, filterText, option) =>
-					label.toLowerCase().includes(filterText.toLowerCase()) ||
-					option.id.value.toString().startsWith(filterText.toLowerCase())}
-				items={groups}
-				showChevron={true}
-				placeholder={$_("search-for-an-organization-or-team-by-name-or-id")}
-				noOptionsMessage={$_("no-organization-or-team-found")}
-				bind:selectedValue={group}
-				on:select={(selectedValue) => {
-					editable.group = selectedValue.detail.value.id;
-				}}
-				on:clear={() => (editable.group = null)}
-			/>
+			<select
+				class="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
+				bind:value={editable.group}
+			>
+				{#each groups as g}
+					<option value={g.value.id}>{g.label}</option>
+				{/each}
+			</select>
 		</div>
 		<div class="text-sm w-full mt-2">
 			<span class="font-semibold text-gray-700">{$_("distance")}</span>
@@ -292,7 +290,7 @@
 			<span class="text-gray-700">{original_data.distance / 1000} km</span>
 		</div>
 		<div class="text-sm w-full mt-2">
-			<span class="font-semibold text-gray-700">{$_('created_via')}</span>
+			<span class="font-semibold text-gray-700">{$_("created_via")}</span>
 			<br />
 			<span class="text-gray-700">{original_data.created_via}</span>
 		</div>