diff --git a/src-web/components/AppRouter.tsx b/src-web/components/AppRouter.tsx
index 06504696..f3d61137 100644
--- a/src-web/components/AppRouter.tsx
+++ b/src-web/components/AppRouter.tsx
@@ -3,11 +3,11 @@ import { routePaths, useAppRoutes } from '../hooks/useAppRoutes';
 import { useRecentRequests } from '../hooks/useRecentRequests';
 import { useRequests } from '../hooks/useRequests';
 import { GlobalHooks } from './GlobalHooks';
-import RouteError from './RouteError';
 import Workspace from './Workspace';
 import Workspaces from './Workspaces';
 import { DialogProvider } from './DialogContext';
-import { useRecentEnvironments } from '../hooks/useRecentEnvironments';
+import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
+import RouteError from './RouteError';
 
 const router = createBrowserRouter([
   {
@@ -48,7 +48,7 @@ export function AppRouter() {
 
 function WorkspaceOrRedirect() {
   const recentRequests = useRecentRequests();
-  const recentEnvironments = useRecentEnvironments();
+  const activeEnvironmentId = useActiveEnvironmentId();
   const requests = useRequests();
   const request = requests.find((r) => r.id === recentRequests[0]);
   const routes = useAppRoutes();
@@ -57,8 +57,8 @@ function WorkspaceOrRedirect() {
     return <Workspace />;
   }
 
-  const environmentId = recentEnvironments[0];
   const { id: requestId, workspaceId } = request;
+  const environmentId = activeEnvironmentId ?? undefined;
 
   return (
     <Navigate
diff --git a/src-web/components/core/Editor/twig/completion.ts b/src-web/components/core/Editor/twig/completion.ts
index 22659cd8..4558674b 100644
--- a/src-web/components/core/Editor/twig/completion.ts
+++ b/src-web/components/core/Editor/twig/completion.ts
@@ -4,7 +4,7 @@ import { w } from '@tauri-apps/api/clipboard-79413165';
 const openTag = '${[ ';
 const closeTag = ' ]}';
 
-export interface TwigCompletionOption {
+interface TwigCompletionOption {
   name: string;
 }
 
diff --git a/src-web/components/core/Editor/twig/placeholder.ts b/src-web/components/core/Editor/twig/placeholder.ts
index 7f921039..ee1db575 100644
--- a/src-web/components/core/Editor/twig/placeholder.ts
+++ b/src-web/components/core/Editor/twig/placeholder.ts
@@ -13,7 +13,9 @@ class PlaceholderWidget extends WidgetType {
   }
   toDOM() {
     const elt = document.createElement('span');
-    elt.className = `placeholder-widget ${!this.isExistingVariable ? 'placeholder-widget-error' : ''}`;
+    elt.className = `placeholder-widget ${
+      !this.isExistingVariable ? 'placeholder-widget-error' : ''
+    }`;
     elt.textContent = this.name;
     return elt;
   }
diff --git a/src-web/lib/initPathnamePersistance.ts b/src-web/lib/initPathnamePersistance.ts
new file mode 100644
index 00000000..fbe4d922
--- /dev/null
+++ b/src-web/lib/initPathnamePersistance.ts
@@ -0,0 +1,21 @@
+import { appWindow } from '@tauri-apps/api/window';
+import { NAMESPACE_NO_SYNC, getKeyValue, setKeyValue } from './keyValueStore';
+
+const key = ['window_pathname', appWindow.label];
+const namespace = NAMESPACE_NO_SYNC;
+const fallback = undefined;
+
+export async function initPathnamePersistance() {
+  if (window.location.pathname === '/') {
+    const pathname = await getKeyValue<string | undefined>({ key, namespace, fallback });
+    if (pathname != null) {
+      window.location.replace(pathname);
+    }
+    return;
+  }
+
+  window.addEventListener('pushstate', async () => {
+    const { pathname: value } = window.location;
+    await setKeyValue<string | undefined>({ key, namespace, value });
+  });
+}
diff --git a/src-web/main.tsx b/src-web/main.tsx
index 7ffce4b8..aeb05978 100644
--- a/src-web/main.tsx
+++ b/src-web/main.tsx
@@ -4,10 +4,17 @@ import { App } from './components/App';
 import { getKeyValue } from './lib/keyValueStore';
 import { getPreferredAppearance, setAppearance } from './lib/theme/window';
 import './main.css';
+import { initPathnamePersistance } from './lib/initPathnamePersistance';
 
-setAppearance(await getKeyValue({ key: 'appearance', fallback: getPreferredAppearance() }));
+await initPathnamePersistance();
+
+setAppearance(
+  await getKeyValue({
+    key: 'appearance',
+    fallback: getPreferredAppearance(),
+  }),
+);
 
-// root holds our app's root DOM Element:
 createRoot(document.getElementById('root') as HTMLElement).render(
   <StrictMode>
     <App />