diff --git a/modules/ui/raw_tag_editor.js b/modules/ui/raw_tag_editor.js
index d8c7e1344..85a7f786e 100644
--- a/modules/ui/raw_tag_editor.js
+++ b/modules/ui/raw_tag_editor.js
@@ -1,4 +1,5 @@
 import _map from 'lodash-es/map';
+import _includes from 'lodash-es/includes';
 
 import { ascending as d3_ascending } from 'd3-array';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
@@ -281,6 +282,15 @@ export function uiRawTagEditor(context) {
                 while (_tags[kNew]) {  // rename key if already in use
                     kNew = base + '_' + suffix++;
                 }
+
+                if (_includes(kNew, '=')) {
+                    var splitStr = kNew.split('=').map(function(str) { return str.trim(); }),
+                        key = splitStr[0],
+                        value = splitStr[1];
+
+                    kNew = key;
+                    d.value = value;
+                }
             }
             tag[kOld] = undefined;
             tag[kNew] = d.value;