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 cf1aab7d4d..81d5c59f1a 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -217,6 +217,7 @@ export const Workspace = (props: WorkspaceProps) => {
   }
 
   const setWorkspace = async (name) => {
+    props.setWorkspace({ name, isLocalhost: name === LOCALHOST })
     if (name === LOCALHOST) {
       props.workspace.clearWorkspace()
     } else if (name === NO_WORKSPACE) {
@@ -228,7 +229,6 @@ export const Workspace = (props: WorkspaceProps) => {
     setState(prevState => {
       return { ...prevState, currentWorkspace: name }
     })
-    props.setWorkspace({ name, isLocalhost: name === LOCALHOST })
   }
 
   const remixdExplorer = {