diff --git a/core/webapp/internal/ViewDesigner/FieldMetaStore.js b/core/webapp/internal/ViewDesigner/FieldMetaStore.js
index 820b830cc2c..e03f500f280 100644
--- a/core/webapp/internal/ViewDesigner/FieldMetaStore.js
+++ b/core/webapp/internal/ViewDesigner/FieldMetaStore.js
@@ -37,7 +37,7 @@ Ext4.define('LABKEY.internal.ViewDesigner.FieldMetaTreeStore', {
                 type: 'json',
                 root: 'columns',
                 idProperty: function(json) {
-                    return json.fieldKeyPath.toUpperCase();
+                    return encodeURI(json.fieldKeyPath.toUpperCase()); // Issue 53197
                 }
             }
         };
@@ -92,7 +92,7 @@ Ext4.define('LABKEY.internal.ViewDesigner.FieldMetaStore', {
                 type: 'json',
                 root: 'columns',
                 idProperty: function(json) {
-                    return json.fieldKeyPath.toUpperCase();
+                    return encodeURI(json.fieldKeyPath.toUpperCase()); // Issue 53197
                 }
             }
         };
@@ -109,7 +109,7 @@ Ext4.define('LABKEY.internal.ViewDesigner.FieldMetaStore', {
     getById : function(id) {
         var _id;
         if (Ext4.isString(id)) {
-            _id = id.toUpperCase();
+            _id = encodeURI(id.toUpperCase()); // Issue 53197
         }
         else {
             _id = id;
diff --git a/core/webapp/internal/ViewDesigner/tab/BaseTab.js b/core/webapp/internal/ViewDesigner/tab/BaseTab.js
index 6d0f73bbfd9..ff11df743d1 100644
--- a/core/webapp/internal/ViewDesigner/tab/BaseTab.js
+++ b/core/webapp/internal/ViewDesigner/tab/BaseTab.js
@@ -13,11 +13,11 @@ Ext4.define('LABKEY.internal.ViewDesigner.model.FieldKey', {
             mapping: 'fieldKey',
             convert : function(fieldKey, rec) {
                 if (Ext4.isString(fieldKey)) {
-                    return fieldKey.toUpperCase();
+                    return encodeURI(fieldKey.toUpperCase()); // Issue 53197
                 }
 
                 if (rec && rec.raw && Ext4.isString(rec.raw.fieldKey)) {
-                    return rec.raw.fieldKey.toUpperCase();
+                    return encodeURI(rec.raw.fieldKey.toUpperCase()); // Issue 53197
                 }
 
                 throw new Error('LABKEY.internal.ViewDesigner.model.FieldKey: unable to generate id due to missing fieldKey.');
@@ -30,7 +30,7 @@ Ext4.define('LABKEY.internal.ViewDesigner.model.FieldKey', {
         getById: function(id) {
             var _id;
             if (Ext4.isString(id)) {
-                _id = id.toUpperCase();
+                _id = encodeURI(id.toUpperCase()); // Issue 53197
             }
             else {
                 _id = id;
@@ -51,7 +51,7 @@ Ext4.define('LABKEY.internal.ViewDesigner.store.FieldKey', {
     getById: function(id) {
         var _id;
         if (Ext4.isString(id)) {
-            _id = id.toUpperCase();
+            _id = encodeURI(id.toUpperCase()); // Issue 53197
         }
         else {
             _id = id;