diff --git a/client/components/activities/comments.js b/client/components/activities/comments.js
index 50ca019b4..8aafc2eba 100644
--- a/client/components/activities/comments.js
+++ b/client/components/activities/comments.js
@@ -3,6 +3,7 @@ const commentFormIsOpen = new ReactiveVar(false);
 BlazeComponent.extendComponent({
   onDestroyed() {
     commentFormIsOpen.set(false);
+    $(".note-popover").hide();
   },
 
   commentFormIsOpen() {
diff --git a/client/components/cards/cardDescription.js b/client/components/cards/cardDescription.js
index 8e2bc77a8..0b26d3ec0 100644
--- a/client/components/cards/cardDescription.js
+++ b/client/components/cards/cardDescription.js
@@ -3,6 +3,7 @@ const descriptionFormIsOpen = new ReactiveVar(false);
 BlazeComponent.extendComponent({
   onDestroyed() {
     descriptionFormIsOpen.set(false);
+    $(".note-popover").hide();
   },
 
   descriptionFormIsOpen() {