From 3fde5c27ede60ed0a360b7b074a72d6f1e1fff3c Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 14 Oct 2021 11:07:49 +0100
Subject: [PATCH] Fix switching projects

---
 packages/node_modules/@node-red/editor-client/src/js/nodes.js | 3 ++-
 packages/node_modules/@node-red/editor-client/src/js/red.js   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index f4378850f..043663161 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -2384,7 +2384,6 @@ RED.nodes = (function() {
     }
 
     function clear() {
-        allNodes.clear();
         links = [];
         linkTabMap = {};
         nodeLinks = {};
@@ -2405,6 +2404,8 @@ RED.nodes = (function() {
         initialLoad = null;
         workspaces = {};
 
+        allNodes.clear();
+
         RED.nodes.dirty(false);
         RED.view.redraw(true, true);
         RED.palette.refresh();
diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
index d9ef01021..e9f45044f 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -251,6 +251,9 @@ var RED = (function() {
                         if (/^#flow\/.+$/.test(currentHash)) {
                             RED.workspaces.show(currentHash.substring(6),true);
                         }
+                        if (RED.workspaces.active() === 0 && RED.workspaces.count() > 0) {
+                            RED.workspaces.show(RED.nodes.getWorkspaceOrder()[0])
+                        }
                     } catch(err) {
                         console.warn(err);
                         RED.notify(