diff --git a/css/80_app.css b/css/80_app.css
index 5f37262a4..2ab6f09b0 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -2342,15 +2342,15 @@ input.date-selector {
 
 /* Field - Changeset Comment
 ------------------------------------------------------- */
-.form-field-comment:not(.present) #preset-input-comment {
-    border-color: rgb(230, 100, 100);
+.form-field-comment:not(.present) textarea {
+    border-color: rgb(160, 160, 160);
 }
 .form-field-comment:not(.present) .field-label {
-    border-color: rgb(230, 100, 100);
-    background: rgba(230, 100, 100, 0.2);
+    border-color: rgb(160, 160, 160);
+    background-color: rgba(160, 160, 160, 0.2);
 }
 .form-field-comment:not(.present) button {
-    border-color: rgb(230, 100, 100);
+    border-color: rgb(160, 160, 160);
 }
 
 
diff --git a/modules/ui/changeset_editor.js b/modules/ui/changeset_editor.js
index ec489bf30..670ced36c 100644
--- a/modules/ui/changeset_editor.js
+++ b/modules/ui/changeset_editor.js
@@ -99,7 +99,7 @@ export function uiChangesetEditor(context) {
 
         // Show warning(s) if comment mentions Google or comment length exceeds 255 chars
         const warnings = [];
-        if (_tags.comment.match(/google/i)) {
+        if (_tags.comment?.match(/google/i)) {
             warnings.push({
                 id: 'contains "google"',
                 msg: t.append('commit.google_warning'),
diff --git a/modules/ui/commit.js b/modules/ui/commit.js
index 7508a4be9..ed1b779ca 100644
--- a/modules/ui/commit.js
+++ b/modules/ui/commit.js
@@ -463,9 +463,6 @@ export function uiCommit(context) {
 
     function changeTags(_, changed, onInput) {
         if (changed.hasOwnProperty('comment')) {
-            if (changed.comment === undefined) {
-                changed.comment = '';
-            }
             if (!onInput) {
                 prefs('comment', changed.comment);
                 prefs('commentDate', Date.now());