diff --git a/src/content/github.js b/src/content/github.js
index 377d21fb5..ea4a48ad6 100644
--- a/src/content/github.js
+++ b/src/content/github.js
@@ -53,6 +53,7 @@ togglbutton.render(
       className: "github",
       description: description,
       projectName: projectElem && projectElem.textContent,
+      autoTrackerKey: "pull-issue"
     });
 
     div.appendChild(link);
@@ -83,6 +84,7 @@ togglbutton.render(
       className: "github",
       description: description,
       projectName: projectElem ? projectElem.textContent.trim() : "",
+      autoTrackerKey: "peek"
     });
 
     div.appendChild(link);
@@ -118,6 +120,7 @@ togglbutton.render(
       className: "github",
       description: getDescription,
       projectName: projectElem && projectElem.textContent,
+      autoTrackable: true
     });
 
     const wrapper = createTag(
diff --git a/src/content/notion.js b/src/content/notion.js
index 2a2da8f33..f1a5b8b47 100644
--- a/src/content/notion.js
+++ b/src/content/notion.js
@@ -26,7 +26,8 @@ togglbutton.render(
 
     const link = togglbutton.createTimerLink({
       className: 'notion',
-      description: getDescription
+      description: getDescription,
+      autoTrackerKey: "side_peek"
     });
 
     const wrapper = createWrapper(link);
@@ -75,7 +76,8 @@ togglbutton.render(
 
     const link = togglbutton.createTimerLink({
       className: 'notion',
-      description: getDescription
+      description: getDescription,
+      autoTrackerKey: "document"
     });
 
     const wrapper = createWrapper(link);