diff --git a/extension/src/service-worker/router/index.ts b/extension/src/service-worker/router/index.ts
index 50cbd39..94dcb35 100644
--- a/extension/src/service-worker/router/index.ts
+++ b/extension/src/service-worker/router/index.ts
@@ -35,7 +35,7 @@ export async function route(
   const setupUrl = chrome.runtime.getURL('setup.html');
   const senderUrl = sender.url ?? '';
 
-  const isPopup   = senderUrl === popupUrl;
+  const isPopup   = senderUrl.startsWith(popupUrl);
   const isSetup   = senderUrl.startsWith(setupUrl);
   const isContent = sender.tab !== undefined
                   && sender.frameId === 0