diff --git a/src/github-injector.ts b/src/github-injector.ts
index c9d7665..ddae9ac 100644
--- a/src/github-injector.ts
+++ b/src/github-injector.ts
@@ -1,30 +1,16 @@
 import { readCoverageData } from "./api";
 import { createButton, createButtonContent } from "./github/components/button";
 import { SELECTOR_PR_REVIEW_TOOLS } from "./github/components/selectors";
+import { addPageLoadListener } from "./github/events";
 
 const coverageData = new Map<string, FileCoverage>();
 
 export function tryInjectDiffUI(): void {
   try {
-    tryInjectDiffCommitUI();
-
-    // Set up observer for future tab changes
-    const observer = new MutationObserver((mutations) => {
-      let update = false;
-      mutations.forEach((mutation) => {
-        if (mutation.type === "attributes" || mutation.addedNodes.length > 0) {
-          update = true;
-        }
-      });
-
-      if (update) {
-        tryInjectDiffCommitUI();
-      }
-    });
+    void tryInjectDiffCommitUI();
 
-    observer.observe(document.body, {
-      childList: true,
-      subtree: true,
+    addPageLoadListener(() => {
+      void tryInjectDiffCommitUI();
     });
   } catch (error: any) {
     console.warn(`[qlty] Could not load coverage: ${error.message}`);
@@ -82,7 +68,6 @@ function setupJumpToUncoveredLineHotkey() {
 function tryInjectDiffCommitUI(): void {
   const rootElement =
     document.getElementById("diff-content-parent") || document.body;
-  if (rootElement.classList.contains("qlty-diff-ui")) return;
 
   const links: Element[] = [];
   rootElement.querySelectorAll('a[href^="#diff-"').forEach((link) => {
@@ -200,7 +185,8 @@ function addNextUncoveredLineButton(): void {
 
   let existingButton = document.querySelector(".qlty-btn-next-uncovered-line");
   if (existingButton) {
-    return;
+    // Replace the button with a new one
+    existingButton.remove();
   }
 
   if (getUncoveredLineDivs().length === 0) {
diff --git a/src/github/events.ts b/src/github/events.ts
new file mode 100644
index 0000000..3744feb
--- /dev/null
+++ b/src/github/events.ts
@@ -0,0 +1,6 @@
+export const addPageLoadListener = (cb: () => any) => {
+  // GitHub uses hotwired/turbo under the hood
+  document.addEventListener('turbo:load', () => {
+    cb();
+  });
+};