diff --git a/app/assets/javascripts/discourse/app/components/composer-message.js b/app/assets/javascripts/discourse/app/components/composer-message.js
index 19eb8fdc9a..21b68a0fae 100644
--- a/app/assets/javascripts/discourse/app/components/composer-message.js
+++ b/app/assets/javascripts/discourse/app/components/composer-message.js
@@ -1,22 +1,21 @@
+import deprecated from "discourse-common/lib/deprecated";
 import discourseComputed from "discourse-common/utils/decorators";
 import Component from "@ember/component";
 import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Component.extend({
-  classNameBindings: [":composer-popup", ":hidden", "message.extraClass"],
+  classNameBindings: [":composer-popup", "message.extraClass"],
 
   @discourseComputed("message.templateName")
   layout(templateName) {
     return getOwner(this).lookup(`template:composer/${templateName}`);
   },
 
-  didInsertElement() {
-    this._super(...arguments);
-    this.element.style.display = "block";
-  },
-
   actions: {
     closeMessage() {
+      deprecated(
+        'You should use `action=(closeMessage message)` instead of `action=(action "closeMessage")`'
+      );
       this.closeMessage(this.message);
     },
   },
diff --git a/app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs
index 50f12536d6..29edcc8080 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
-<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
+<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
 <p>{{html-safe message.body}}</p>
diff --git a/app/assets/javascripts/discourse/app/templates/composer/education.hbs b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
index ea644416c0..c3a23009b3 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
+<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
 {{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
index ea644416c0..c3a23009b3 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
+<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
 {{html-safe message.body}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
index 8a44bb09de..eefe3880ce 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
@@ -1,4 +1,4 @@
-<a href {{action "closeMessage"}} class="close">{{d-icon "times"}}</a>
+<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
 <h3>{{i18n "composer.similar_topics"}}</h3>
 
 <ul class="topics">