diff --git a/src/zen/spaces/ZenSpace.mjs b/src/zen/spaces/ZenSpace.mjs
index 06e9af39f..67556a64a 100644
--- a/src/zen/spaces/ZenSpace.mjs
+++ b/src/zen/spaces/ZenSpace.mjs
@@ -287,6 +287,12 @@ export class nsZenWorkspace extends MozXULElement {
 
     this.addEventListener("TabPinned", tabPinCallback);
     this.addEventListener("TabUnpinned", tabPinCallback);
+    this.addEventListener("TabGroupRemovedFromDOM", () => {
+      // Wait for the group to be removed from the DOM.
+      setTimeout(() => {
+        tabPinCallback();
+      });
+    });
     this.addEventListener("TabClose", event => {
       if (event.target.pinned) {
         tabPinCallback();