From 9f7078d7bd0296e1d2932a4473b282a9ab0f44fa Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 16 Mar 2021 16:00:52 +0100
Subject: [PATCH] fix switching workspace if disconnect

---
 libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 81d5c59f1a..91038fa139 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -81,6 +81,12 @@ export const Workspace = (props: WorkspaceProps) => {
     getWorkspaces()
   }, [props.workspaces])
 
+  const localhostDisconnect = () => {
+    if (state.currentWorkspace === LOCALHOST) setWorkspace(props.workspaces.length > 0 ? props.workspaces[0] : NO_WORKSPACE)
+  }
+  props.localhost.event.unregister('disconnected', localhostDisconnect)
+  props.localhost.event.register('disconnected', localhostDisconnect)
+
   useEffect(() => {
     props.localhost.event.register('connected', () => {
       remixdExplorer.show()
@@ -88,7 +94,6 @@ export const Workspace = (props: WorkspaceProps) => {
 
     props.localhost.event.register('disconnected', () => {
       remixdExplorer.hide()
-      setWorkspace(props.workspaces.length > 0 ? props.workspaces[0] : NO_WORKSPACE)
     })
 
     props.localhost.event.register('loading', () => {