diff --git a/_includes/components/fediverse-modal.njk b/_includes/components/fediverse-modal.njk
index 6dd693b..0f95228 100644
--- a/_includes/components/fediverse-modal.njk
+++ b/_includes/components/fediverse-modal.njk
@@ -5,14 +5,7 @@
   <div class="fixed inset-0 z-50 flex items-center justify-center p-4"
        @keydown.escape.window="showModal = false"
        x-init="$nextTick(() => { const input = $el.querySelector('input'); if (input) input.focus(); })"
-       @keydown.tab="
-         const focusable = [...$el.querySelectorAll('button, input, a, [tabindex]:not([tabindex=\"-1\"])')].filter(el => !el.closest('[x-show]') || el.closest('[x-show]').style.display !== 'none');
-         if (!focusable.length) return;
-         const first = focusable[0];
-         const last = focusable[focusable.length - 1];
-         if ($event.shiftKey && document.activeElement === first) { $event.preventDefault(); last.focus(); }
-         else if (!$event.shiftKey && document.activeElement === last) { $event.preventDefault(); first.focus(); }
-       ">
+       @keydown.tab="trapFocus($event)">
     {# Backdrop #}
     <div class="fixed inset-0 bg-black/40"
          x-transition:enter="transition ease-out duration-200"
diff --git a/js/fediverse-interact.js b/js/fediverse-interact.js
index 82e3ef7..4d1375b 100644
--- a/js/fediverse-interact.js
+++ b/js/fediverse-interact.js
@@ -133,6 +133,15 @@ document.addEventListener("alpine:init", () => {
       }
     },
 
+    trapFocus(event) {
+      const focusable = [...this.$el.querySelectorAll('button, input, a, [tabindex]:not([tabindex="-1"])')].filter(el => !el.closest('[x-show]') || el.closest('[x-show]').style.display !== 'none');
+      if (!focusable.length) return;
+      const first = focusable[0];
+      const last = focusable[focusable.length - 1];
+      if (event.shiftKey && document.activeElement === first) { event.preventDefault(); last.focus(); }
+      else if (!event.shiftKey && document.activeElement === last) { event.preventDefault(); first.focus(); }
+    },
+
     redirectToInstance(domain) {
       if (this.mode === "share") {
         window.location.href = `https://${domain}/share?text=${encodeURIComponent(this.targetUrl)}`;