diff --git a/src/popup.tsx b/src/popup.tsx
index 4f52058..608bcd2 100644
--- a/src/popup.tsx
+++ b/src/popup.tsx
@@ -471,6 +471,11 @@ if (!document.getElementById(ROOT_CONTAINER_ID)) {
 
         setMentions(allMentions.mentions);
         setDirectReferences(allMentions.direct);
+        if (allMentions.count === 0) {
+          if (popupDisplayed && !popupFormDisplayed) {
+            setPopupDisplayed(false);
+          }
+        }
       }
 
       handle();