diff --git a/ember/frontend/app/analysis/index/controller.js b/ember/frontend/app/analysis/index/controller.js
index 59ed9b88b..f6a8b4d43 100644
--- a/ember/frontend/app/analysis/index/controller.js
+++ b/ember/frontend/app/analysis/index/controller.js
@@ -84,6 +84,8 @@ export default class AnalysisController extends QPController {
   @tracked ordering = "-date";
   @tracked comment;
 
+  @tracked appliedComment;
+
   get billingTypes() {
     return this.store.peekAll("billing-type");
   }
@@ -125,9 +127,25 @@ export default class AnalysisController extends QPController {
   }
 
   get appliedFilters() {
-    return Object.keys(queryParamsState(this)).filter((key) => {
-      return key !== "ordering" && queryParamsState(this)?.[key]?.changed;
+    const appliedFilters = Object.keys(queryParamsState(this)).filter((key) => {
+      return (
+        !["ordering", "comment"].includes(key) &&
+        queryParamsState(this)?.[key]?.changed
+      );
     });
+
+    // `this.comment` and the `comment` qp are updated on every keystroke
+    // while we only fetch (`this._reset`) "on change", we need some extra handling
+    // so we don't display "comment" as an applied filter before actually applying it
+
+    // fixing this properly would require refactoring the QP handling altogether (#1483)
+    // or refactoring the ReportComment component, which are both non-trivial.
+
+    // hence this hack.
+    if (this.appliedComment) {
+      appliedFilters.push("comment");
+    }
+    return appliedFilters;
   }
 
   get jwt() {
@@ -173,6 +191,7 @@ export default class AnalysisController extends QPController {
   @action
   reset() {
     this.resetQueryParams({ except: ["ordering"] });
+    this.appliedComment = undefined;
   }
 
   @action
@@ -187,6 +206,7 @@ export default class AnalysisController extends QPController {
     this.selectedReportIds = [];
     this.totalTime = Duration.fromMillis(0);
     this.totalItems = 0;
+    this.appliedComment = undefined;
 
     this.data.perform();
   }
@@ -216,6 +236,8 @@ export default class AnalysisController extends QPController {
       serializeQueryParams(this.allQueryParams, queryParamsState(this)),
     );
 
+    this.appliedComment = params.comment;
+
     if (this._canLoadMore) {
       const data = await this.store.query("report", {
         page: {
@@ -389,4 +411,9 @@ export default class AnalysisController extends QPController {
   dateFromString(str) {
     return DateTime.fromISO(str);
   }
+
+  @action
+  updateComment(value) {
+    this.comment = value ? value : undefined; // empty comment -> no query param
+  }
 }
diff --git a/ember/frontend/app/analysis/index/template.gjs b/ember/frontend/app/analysis/index/template.gjs
index 506b1befe..301fd97ab 100644
--- a/ember/frontend/app/analysis/index/template.gjs
+++ b/ember/frontend/app/analysis/index/template.gjs
@@ -84,7 +84,7 @@ const AnalysisIndexTemplate = <template>
                   <ReportComment
                     id={{id}}
                     @value={{@controller.comment}}
-                    @onChange={{fn (mut @controller.comment)}}
+                    @onChange={{@controller.updateComment}}
                     placeholder="Comment"
                     name="comment"
                     type="text"