diff --git a/ui/src/components/DiagnosticLogs.vue b/ui/src/components/DiagnosticLogs.vue
index 2c1758c7..8151c453 100644
--- a/ui/src/components/DiagnosticLogs.vue
+++ b/ui/src/components/DiagnosticLogs.vue
@@ -54,10 +54,18 @@
           <textarea readonly id="logsBlock" v-model="viewTextOther" />
         </div>
         <div v-if="activeTabName == 'userComment'" class="flexColumn">
-          <div style="margin-bottom: 5px">
-            Please write a description of the problem you are experiencing:
+          <div style="display: flex; margin-bottom: 5px">
+            <div style="flex-grow: 1">
+              Please write a description of the problem you are experiencing:
+            </div>
+            <div>
+              [ {{ 9000 - userComment.length }}
+              / 9000 ]
+            </div>
           </div>
+
           <textarea
+            maxlength="9000"
             id="commentBlock"
             v-model="userComment"
             v-bind:class="{
diff --git a/ui/src/sentry/sentry.js b/ui/src/sentry/sentry.js
index 41b28c81..68499290 100644
--- a/ui/src/sentry/sentry.js
+++ b/ui/src/sentry/sentry.js
@@ -51,12 +51,18 @@ export function SentrySendDiagnosticReport(
   comment,
   eventAdditionalDataObject,
   daemonVer,
-  buildExtraInfo
+  buildExtraInfo,
 ) {
   if (!DSN || comment == "" || eventAdditionalDataObject == null) return;
 
   if (!daemonVer) daemonVer = "UNKNOWN";
 
+  if (comment.length > 400) {
+    eventAdditionalDataObject["  User comment (full)"] = comment;
+    comment =
+      comment.substr(0, 400) +
+      " ... \n\n<read full comment in 'ADDITIONAL DATA' section>";
+  }
   // Sentry can not accept very long fields (>16KB)
   // therefore, here we are dividing fields on smaller
   const maxFieldSize = 16 * 1024;