diff --git a/core/field_textinput.js b/core/field_textinput.js
index 86858b4fe..d727603fe 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -281,6 +281,10 @@ Blockly.FieldTextInput.prototype.onHtmlInputChange_ = function(_e) {
   var text = htmlInput.value;
   if (text !== htmlInput.oldValue_) {
     htmlInput.oldValue_ = text;
+
+    // TODO(#2169): Once issue is fixed the setGroup functionality could be
+    //              moved up to the Field setValue method. This would create a
+    //              broader fix for all field types.
     Blockly.Events.setGroup(true);
     this.setValue(text);
     Blockly.Events.setGroup(false);