diff --git a/src/common/tri.c b/src/common/tri.c
index 1f8682b..7778d16 100644
--- a/src/common/tri.c
+++ b/src/common/tri.c
@@ -113,6 +113,10 @@ void *tri_get_string_autocomplete(struct tri *tri, const char *string, bool *amb
 		node = node->nodes[idx];
 	}
 
+	if (node->value) {
+		return node->value;
+	}
+
 	while(1) {
 		struct tri_node *next_node = NULL;
 		int num_paths = 0;