diff --git a/packages/app/package.json b/packages/app/package.json
index 997948a64fc2..66c69e118d70 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -11,6 +11,7 @@
     "cypress:launch": "cross-env TZ=America/New_York node ../../scripts/cypress open --project ${PWD}",
     "cypress:open": "yarn gulp cyOpenAppE2E",
     "cypress:run:e2e": "yarn gulp cyRunAppE2E",
+    "debug": "gulp debug --project ${PWD}",
     "dev": "gulp dev --project ${PWD}",
     "start": "echo \"run 'yarn dev' from the root\" && exit 1",
     "watch": "echo \"run 'yarn dev' from the root\" && exit 1",
diff --git a/packages/app/src/router/router.ts b/packages/app/src/router/router.ts
index a9464bae1899..ac71c87e89b5 100644
--- a/packages/app/src/router/router.ts
+++ b/packages/app/src/router/router.ts
@@ -5,8 +5,11 @@ import { setupLayouts } from 'virtual:generated-layouts'
 export const createRouter = () => {
   const routes = setupLayouts(generatedRoutes)
 
+  // TODO: clean this up
+  const historyBase = window.location.href.includes('__vite__') ? '__vite__' : ''
+
   return _createRouter({
-    history: createWebHistory('/__vite__/'),
+    history: createWebHistory(historyBase),
     routes,
   })
 }