diff --git a/src/core/client.mjs b/src/core/client.mjs
index 1cd719b..f4307be 100644
--- a/src/core/client.mjs
+++ b/src/core/client.mjs
@@ -8,7 +8,6 @@ import { checkForUpdate } from "./updateCheck.mjs";
 import { sendTelemetryPing } from "./sendTelemetry.mjs";
 import { Modal, Frame } from "./islands/Modal.mjs";
 import { MenuButton } from "./islands/MenuButton.mjs";
-import { TopbarButton } from "./islands/TopbarButton.mjs";
 import { Tooltip } from "./islands/Tooltip.mjs";
 import { Panel } from "./islands/Panel.mjs";
 
diff --git a/src/core/islands/Panel.mjs b/src/core/islands/Panel.mjs
index 02b8636..ef155c6 100644
--- a/src/core/islands/Panel.mjs
+++ b/src/core/islands/Panel.mjs
@@ -138,17 +138,18 @@ function Panel({
       </aside>
     </div>`;
 
-  const topbarFavorite = ".notion-topbar .notion-topbar-favorite-button",
+  const notionTopbar = ".notion-topbar",
+    topbarFavorite = ".notion-topbar-favorite-button",
     $topbarToggle = html`<${TopbarButton}
       aria-label="Toggle side panel"
       icon="panel-right"
     />`,
     addToTopbar = () => {
-      if (document.contains($topbarToggle)) removeMutationListener(addToTopbar);
+      if (document.contains($topbarToggle)) return;
       document.querySelector(topbarFavorite)?.after($topbarToggle);
     };
   $panelToggle.onclick = $topbarToggle.onclick = () => $panel.toggle();
-  addMutationListener(topbarFavorite, addToTopbar);
+  addMutationListener(notionTopbar, addToTopbar, { subtree: false });
   addToTopbar();
 
   isEnabled(topbarId).then(async (topbarEnabled) => {
diff --git a/src/extensions/topbar/client.mjs b/src/extensions/topbar/client.mjs
index 77a9bfe..575d8cf 100644
--- a/src/extensions/topbar/client.mjs
+++ b/src/extensions/topbar/client.mjs
@@ -106,7 +106,7 @@ export default async function (api, db) {
 
   const alwaysOnTopButton = await db.get("alwaysOnTopButton");
   if (alwaysOnTopButton === "Disabled") return;
-  const topbarFavorite = `.notion-topbar ${favoriteSelector}`,
+  const notionTopbar = ".notion-topbar",
     pinIcon = await db.get("pinIcon"),
     unpinIcon = await db.get("unpinIcon"),
     $pin = html`<${TopbarButton}
@@ -135,11 +135,11 @@ export default async function (api, db) {
       icon="pin-off"
     />`,
     addToTopbar = () => {
-      if (document.contains($pin)) removeMutationListener(addToTopbar);
-      document.querySelector(topbarFavorite)?.after($pin, $unpin);
+      if (document.contains($pin)) return;
+      document.querySelector(favoriteSelector)?.after($pin, $unpin);
     };
   html`<${Tooltip}><b>${pinTooltip}</b><//>`.attach($pin, "bottom");
   html`<${Tooltip}><b>${unpinTooltip}</b><//>`.attach($unpin, "bottom");
-  addMutationListener(topbarFavorite, addToTopbar);
-  addToTopbar(topbarFavorite);
+  addMutationListener(notionTopbar, addToTopbar, { subtree: false });
+  addToTopbar();
 }