diff --git a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
index e23b9370ae0..de7e63f3dcd 100644
--- a/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
+++ b/app/assets/javascripts/discourse/app/mixins/card-contents-base.js
@@ -126,6 +126,8 @@ export default Mixin.create({
       this,
       "_topicHeaderTrigger"
     );
+
+    this.appEvents.on("card:close", this, "_close");
   },
 
   @bind
@@ -334,6 +336,7 @@ export default Mixin.create({
       "_topicHeaderTrigger"
     );
 
+    this.appEvents.off("card:close", this, "_close");
     this._hide();
   },