diff --git a/modules/ui/fields/address.js b/modules/ui/fields/address.js
index 4ed7cb1b4..60f6d134e 100644
--- a/modules/ui/fields/address.js
+++ b/modules/ui/fields/address.js
@@ -139,7 +139,7 @@ export function uiFieldAddress(field, context) {
             });
         }
 
-        wrap.selectAll('div')
+        wrap.selectAll('div.addr-row')
             .data(addressFormat.format)
             .enter()
             .append('div')
@@ -172,7 +172,7 @@ export function uiFieldAddress(field, context) {
                     : (tag === 'city') ? getNearCities
                     : getNearValues;
 
-            wrap.selectAll('.addr-' + tag)
+            wrap.selectAll('input.addr-' + tag)
                 .call(d3combobox()
                     .minItems(1)
                     .fetcher(function(value, callback) {