diff --git a/modules/ui/fields/address.js b/modules/ui/fields/address.js
index a56bc3449..998393f33 100644
--- a/modules/ui/fields/address.js
+++ b/modules/ui/fields/address.js
@@ -258,7 +258,8 @@ export function uiFieldAddress(field, context) {
                 .each(function (subfield) {
                     var key = field.key + ':' + subfield.id;
 
-                    var value = context.cleanTagValue(this.value);
+                    var value = this.value;
+                    if (!onInput) value = context.cleanTagValue(value);
 
                     // don't override multiple values with blank string
                     if (Array.isArray(_tags[key]) && !value) return;
diff --git a/modules/ui/fields/input.js b/modules/ui/fields/input.js
index 9997b2b65..5e7069d42 100644
--- a/modules/ui/fields/input.js
+++ b/modules/ui/fields/input.js
@@ -166,7 +166,8 @@ export function uiFieldText(field, context) {
     function change(onInput) {
         return function() {
             var t = {};
-            var val = context.cleanTagValue(utilGetSetValue(input));
+            var val = utilGetSetValue(input);
+            if (!onInput) val = context.cleanTagValue(val);
 
             // don't override multiple values with blank string
             if (!val && Array.isArray(_tags[field.key])) return;
diff --git a/modules/ui/fields/localized.js b/modules/ui/fields/localized.js
index 9cd606a18..c222bc2b3 100644
--- a/modules/ui/fields/localized.js
+++ b/modules/ui/fields/localized.js
@@ -385,7 +385,8 @@ export function uiFieldLocalized(field, context) {
                     return;
                 }
 
-                var val = context.cleanTagValue(utilGetSetValue(d3_select(this)));
+                var val = utilGetSetValue(d3_select(this));
+                if (!onInput) val = context.cleanTagValue(val);
 
                 // don't override multiple values with blank string
                 if (!val && Array.isArray(_tags[field.key])) return;
diff --git a/modules/ui/fields/textarea.js b/modules/ui/fields/textarea.js
index ac5393e7b..31e792052 100644
--- a/modules/ui/fields/textarea.js
+++ b/modules/ui/fields/textarea.js
@@ -41,7 +41,8 @@ export function uiFieldTextarea(field, context) {
     function change(onInput) {
         return function() {
 
-            var val = context.cleanTagValue(utilGetSetValue(input));
+            var val = utilGetSetValue(input);
+            if (!onInput) val = context.cleanTagValue(val);
 
             // don't override multiple values with blank string
             if (!val && Array.isArray(_tags[field.key])) return;