diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/composables/TypeaheadTextField.kt b/app/src/main/java/me/zobrist/tichucounter/ui/composables/TypeaheadTextField.kt
index 7772d39..86c79b7 100644
--- a/app/src/main/java/me/zobrist/tichucounter/ui/composables/TypeaheadTextField.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/ui/composables/TypeaheadTextField.kt
@@ -31,6 +31,15 @@ fun TypeaheadTextField(
     var isFocused by remember { mutableStateOf(false) }
     val focusManager = LocalFocusManager.current
 
+    var filtered = items.filter { it.isNotEmpty() && it != value }
+
+    if(value.isNotEmpty())
+    {
+        filtered = filtered.filter { it.contains(value) }
+    }
+
+    filtered = filtered.sorted().sortedBy { it.length }.take(5)
+
     ExposedDropdownMenuBox(
         expanded = isFocused,
         modifier = modifier,
@@ -75,8 +84,8 @@ fun TypeaheadTextField(
                 .width(with(LocalDensity.current){dropDownWidth.toDp()}),
             onDismissRequest = {  }
         ) {
-            val filtered = items.filter { it.contains(value) && it.isNotBlank() }
-                filtered.forEach {
+
+            filtered.forEach {
                     DropdownMenuItem(
                         onClick = {
                             onValueChange(it)