1 files changed, 19 insertions, 3 deletions
diff --git a/packages/app/src/context/server.tsx b/packages/app/src/context/server.tsx
index 72693e6ef..e01a93381 100644
--- a/packages/app/src/context/server.tsx
+++ b/packages/app/src/context/server.tsx
@@ -28,7 +28,7 @@ function projectsKey(url: string) {
 
 export const { use: useServer, provider: ServerProvider } = createSimpleContext({
   name: "Server",
-  init: (props: { defaultUrl: string }) => {
+  init: (props: { defaultUrl: string, isSidecar?: boolean }) => {
     const platform = usePlatform()
 
     const [store, setStore, _, ready] = persisted(
@@ -59,7 +59,13 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
 
       const fallback = normalizeServerUrl(props.defaultUrl)
       if (fallback && url === fallback) {
-        setState("active", url)
+        batch(() => {
+          if (!store.list.includes(url)) {
+            // Add the fallback url to the list if it's not already in the list
+            setStore("list", store.list.length, url)
+          }
+          setState("active", url)
+        })
         return
       }
 
@@ -89,7 +95,17 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
       if (state.active) return
       const url = normalizeServerUrl(props.defaultUrl)
       if (!url) return
-      setState("active", url)
+      batch(() => {
+
+        // Add the new sidecar url
+        if(props.isSidecar && props.defaultUrl) {
+          add(props.defaultUrl)
+        }
+
+        setState("active", url)
+      })
+
+      console.log(store.list)
     })
 
     const isReady = createMemo(() => ready() && !!state.active)