diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index 91038fa139..c85ad8d8d5 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -90,6 +90,7 @@ export const Workspace = (props: WorkspaceProps) => {
   useEffect(() => {
     props.localhost.event.register('connected', () => {
       remixdExplorer.show()
+      setWorkspace(LOCALHOST)
     })
 
     props.localhost.event.register('disconnected', () => {
diff --git a/libs/remixd/src/bin/remixd.ts b/libs/remixd/src/bin/remixd.ts
index a973c13ead..e0ba1b5301 100644
--- a/libs/remixd/src/bin/remixd.ts
+++ b/libs/remixd/src/bin/remixd.ts
@@ -80,6 +80,7 @@ function startService<S extends 'git' | 'folder'> (service: S, callback: (ws: WS
         console.log(e)
       }
     }
+    process.exit(0)
   }
 
   process.on('SIGINT', kill) // catch ctrl-c