diff --git a/webui/src/lib/components/utils/Selector.svelte b/webui/src/lib/components/utils/Selector.svelte
index dfe7777..fa9c9d3 100644
--- a/webui/src/lib/components/utils/Selector.svelte
+++ b/webui/src/lib/components/utils/Selector.svelte
@@ -209,11 +209,6 @@
 							entry: undefined
 						})
 					);
-				} else if (query.length && types.includes('NewAddress')) {
-					result.push({
-						t: 'NewAddress',
-						c: query
-					});
 				}
 
 				let validOptions = (searchResult?.entries || []).filter(
@@ -242,6 +237,13 @@
 						result.push({ ...common, entry });
 					}
 				}
+
+				if (query.length && !exactHits.length && types.includes('NewAddress')) {
+					result.push({
+						t: 'NewAddress',
+						c: query
+					});
+				}
 			}
 
 			if (types.includes('Attribute')) {