diff --git a/frappe/public/js/form_builder/components/Autocomplete.vue b/frappe/public/js/form_builder/components/Autocomplete.vue
index 3bbaf8b298..7960047b43 100644
--- a/frappe/public/js/form_builder/components/Autocomplete.vue
+++ b/frappe/public/js/form_builder/components/Autocomplete.vue
@@ -19,7 +19,7 @@
 			<div class="combo-box-items">
 				<ComboboxOption
 					as="template"
-					v-for="(field, i) in filteredOptions"
+					v-for="(field, i) in sortedOptions"
 					:key="i"
 					:value="field"
 					v-slot="{ active }"
@@ -85,11 +85,16 @@ const selectedValue = computed({
 });
 
 const filteredOptions = computed(() => {
-	return query.value
-		? props.options.filter((option) => {
-				return option.label.toLowerCase().includes(query.value.toLowerCase());
-		  })
-		: props.options;
+	if (!query.value) return props.options;
+	return props.options.filter((option) => {
+		return option.label.toLocaleLowerCase().includes(query.value.toLocaleLowerCase());
+	});
+});
+
+const sortedOptions = computed(() => {
+	return filteredOptions.value.sort((a, b) => {
+		return a.label.localeCompare(b.label);
+	});
 });
 
 function clear_search() {
@@ -126,6 +131,8 @@ watch(showOptions, (val) => {
 	border-radius: var(--border-radius-sm);
 	padding: 6px 10px;
 	width: 100%;
+	cursor: pointer;
+	user-select: none;
 
 	&:hover,
 	&.active {