diff --git a/packages/app/cypress/integration/basic.spec.ts b/packages/app/cypress/integration/basic.spec.ts
index 77ae8ed09e2e..498ba0f4d4f2 100644
--- a/packages/app/cypress/integration/basic.spec.ts
+++ b/packages/app/cypress/integration/basic.spec.ts
@@ -1,7 +1,7 @@
 describe('App', () => {
   it('resolves the home page', () => {
     cy.visit('http://localhost:5556')
-    cy.get('[href="/__vite__/runner"]').click()
-    cy.get('[href="/__vite__/settings"]').click()
+    cy.get('[data-e2e-href="/runner"]').click()
+    cy.get('[data-e2e-href="/settings"]').click()
   })
 })
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/navigation/SidebarNavigation.vue b/packages/app/src/navigation/SidebarNavigation.vue
index fb5c4b5a3416..944b373938bd 100644
--- a/packages/app/src/navigation/SidebarNavigation.vue
+++ b/packages/app/src/navigation/SidebarNavigation.vue
@@ -21,6 +21,7 @@
           :to="item.href"
         >
           <SidebarNavigationRow
+            :data-e2e-href="item.href"
             :active="isActive"
             :icon="item.icon"
           >
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,
   })
 }
diff --git a/packages/data-context/src/sources/ProjectDataSource.ts b/packages/data-context/src/sources/ProjectDataSource.ts
index 884395f5f189..36a7f8ce1e92 100644
--- a/packages/data-context/src/sources/ProjectDataSource.ts
+++ b/packages/data-context/src/sources/ProjectDataSource.ts
@@ -27,8 +27,14 @@ export class ProjectDataSource {
   async isFirstTimeAccessing (projectRoot: string, testingType: 'e2e' | 'component') {
     try {
       const config = await this.ctx.file.readJsonFile<{ e2e?: object, component?: object }>(path.join(projectRoot, 'cypress.json'))
-      const type = testingType === 'e2e' ? 'e2e' : 'component'
-      const overrides = config[type] || {}
+
+      // If we have a cypress.json file, even with no overrides, assume that it's not our
+      // first time accessing (for now, until the config refactor lands)
+      if (testingType === 'e2e') {
+        return false
+      }
+
+      const overrides = config.component || {}
 
       return Object.keys(overrides).length === 0
     } catch (e) {
diff --git a/packages/data-context/src/sources/WizardDataSource.ts b/packages/data-context/src/sources/WizardDataSource.ts
index 38e47d7c8900..49a029c4c8ee 100644
--- a/packages/data-context/src/sources/WizardDataSource.ts
+++ b/packages/data-context/src/sources/WizardDataSource.ts
@@ -135,10 +135,14 @@ const LanguageNames: Record<WizardCodeLanguage, string> = {
 }
 
 export const wizardGetConfigCodeE2E = (opts: GetCodeOptsE2E): string | null => {
-  return `{
+  const exportStatement =
+    opts.lang === 'js' ? 'module.exports = {' : 'export default {'
+
+  return `${exportStatement}{
   e2e: {
     viewportHeight: 660,
     viewportWidth: 1000,
+  }
 }`
 }