diff --git a/src/html/options.html b/src/html/options.html
index b8041cb..dc1a0d9 100644
--- a/src/html/options.html
+++ b/src/html/options.html
@@ -70,6 +70,15 @@ <h1>Open Links in New Tab</h1>
                 </span>
             </label>
         </div>
+        <div class="form-check form-switch">
+            <input class="form-check-input" type="checkbox" role="switch" id="anchorLinks">
+            <label class="form-check-label" for="anchorLinks" aria-describedby="anchorLinksHelp">
+                Update Anchor Links
+                <span data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-title="Open Same Origin Anchor Links in New Tab.">
+                    <i class="fa-solid fa-circle-info ms-1"></i>
+                </span>
+            </label>
+        </div>
         <div class="form-check form-switch">
             <input class="form-check-input" type="checkbox" role="switch" id="autoReload">
             <label class="form-check-label" for="autoReload" aria-describedby="autoReloadHelp">
diff --git a/src/html/popup.html b/src/html/popup.html
index 01ae7e1..adbc991 100644
--- a/src/html/popup.html
+++ b/src/html/popup.html
@@ -54,6 +54,15 @@
                 </span>
             </label>
         </div>
+        <div class="form-check form-switch">
+            <input class="form-check-input" type="checkbox" role="switch" id="anchorLinks">
+            <label class="form-check-label" for="anchorLinks" aria-describedby="anchorLinksHelp">
+                Update Anchor Links
+                <span data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-title="Open Same Origin Anchor Links in New Tab.">
+                    <i class="fa-solid fa-circle-info ms-1"></i>
+                </span>
+            </label>
+        </div>
         <div class="form-check form-switch">
             <input class="form-check-input" type="checkbox" role="switch" id="autoReload">
             <label class="form-check-label" for="autoReload" aria-describedby="autoReloadHelp">
diff --git a/src/js/service-worker.js b/src/js/service-worker.js
index 67526f6..a7f2571 100644
--- a/src/js/service-worker.js
+++ b/src/js/service-worker.js
@@ -40,6 +40,7 @@ async function onInstalled(details) {
         setDefaultOptions({
             onScroll: false,
             onAttributes: false,
+            anchorLinks: false,
             autoReload: true,
             updateAll: true,
             noOpener: true,
diff --git a/src/js/tab.js b/src/js/tab.js
index 3140822..57d35cb 100644
--- a/src/js/tab.js
+++ b/src/js/tab.js
@@ -2,15 +2,12 @@
 
 const contentScript = true
 let tabEnabled = false
-let noOpener = false
+let options = {}
 
 ;(async () => {
-    const { options, sites } = await chrome.storage.sync.get([
-        'options',
-        'sites',
-    ])
-    noOpener = options.noOpener
-    if (sites?.includes(window.location.host)) {
+    let data = await chrome.storage.sync.get(['options', 'sites'])
+    options = data.options
+    if (data.sites?.includes(window.location.host)) {
         console.log(`Enabled Host: ${window.location.host}`)
         await activateTab('green')
     }
@@ -38,7 +35,6 @@ async function activateTab(color) {
     console.info('Activating Tab...')
     tabEnabled = true
     updateLinks()
-    const { options } = await chrome.storage.sync.get(['options'])
     const observer = new MutationObserver(updateLinks)
     observer.observe(document.body, {
         attributes: options.onAttributes,
@@ -62,9 +58,15 @@ function updateLinks() {
     const elements = document.getElementsByTagName('a')
     for (const element of elements) {
         if (element.href !== '#') {
+            if (!options.anchorLinks && element.href.includes('#')) {
+                const url = new URL(element.href)
+                if (url.origin === window.location.origin) {
+                    continue
+                }
+            }
             if (element.target !== '_blank') {
                 element.target = '_blank'
-                if (noOpener) {
+                if (options.noOpener) {
                     element.setAttribute('rel', 'noopener')
                 }
             }
@@ -92,7 +94,6 @@ async function onChanged(changes, namespace) {
                 }
             } else if (tabEnabled) {
                 console.log(`Disabling: ${window.location.host}`)
-                const { options } = await chrome.storage.sync.get(['options'])
                 if (options.autoReload) {
                     window.location.reload()
                 } else {
@@ -103,9 +104,7 @@ async function onChanged(changes, namespace) {
                 }
             }
         } else if (namespace === 'sync' && key === 'options') {
-            if (oldValue.noOpener !== newValue.noOpener) {
-                noOpener = newValue.noOpener
-            }
+            options = newValue
         }
     }
 }